Improved maintainability and simplified the adding of new gamemodes (WIP)