Good Stuff all!
Made a few mock-ups of future buildings for the new layout.
Don't worry it wont be on the floor! It will replace the current layout in the same spot. 2 feet will be added on the end to fill the whole alcove, 10x5 feet.
There will be a 054 loop around the outside too.