Removed usage of Overlord Controller
Removed Overlord, refactored for seperate dependency injection