Added motor import for new 2d setup. Testing pending...