Massive refactoring, JoystickMap still missing from the model.