- refactoring
- completed save/load logic