Started on flight item, reworked tick handlers

The flight item still needs a lot of work