I have re-worked the design and came up with the following. I combined the time saver module with the yard track, moved it to the edge of the layout and now have a long yard track. With this design I can manually reach everything in the time saver module and yard. The time saver module will double as a diesel and steam locomotive yard. I left the passenger train yard double ended so a train could pull in and out.