Refactoring - Generic Manager
Generic Manager Untested
Again Refactoring
Major Clean and Refactor
Clean and major refactor