whampson GenericSave complete, still needs some testing