A master plan for a station layout that resolves conflicts between freight and commuter rail, and accommodates the expansion of passenger rail services.