Mild refactoring
- saving is currently broken