Implemented object manager, need to refactor app