moved stuff to MotorController, added new vars