VTOL merge

For further discussion and integration of the VTOL capabilities.