VTOL architecture working with caipirinha

This had been removed in master, and should not be re-introduced