Split the actions from the generators
I think I've nailed it this time
Converted the remaining actions
Added TakeOff action

The rewrite was needed due to this action and its context switching.