defensive commit, major refactoring of saving mechanics underway
all simple tests passing but still having issue deserializing references