Latest piece of National Avenue puzzle is falling into place