Cleaned up some Motor code
Added Shooter
Fixed compile errors