Updated Motor Class
Updated Motor stuff