remodularization for easier debugging/game options