Work on Save wizard navigation, SourceDescription now actually save