first pass - can't test yet as SITL seems broken