Code refactored, manager functionality present but no save option