OH... and one of the best changes the above revision brought to the table was the new space under that layout at that location that allowed easy to reach and ample storage for motive power that will be swapped to/from the layout! (Visible in the fifth pic above.)
Andre