work on saves manager, refactoring, specs