New layout for Maneuver computation
I'm moderately satisfied satisfied with this, but it needs some
work on the State objects to make the code readable (see wiki).