Removing debug
Refactored the manager to simplify the State logic to come!