in the process of cleaning up motor class. try this boris