Pull Request - Maneuver Changes

This will close:

#85 and #83