Change responsibilities

Oneill working on Flight Flagging