- Update version
- Main class refix to allow saving