Updated saving and loading to allow explicit stations/junctions