whampson Begin work on GenericSave