Moves flagging/tracking into an independent and testable module
Merge remote-tracking branch 'origin/feature/flagging_tracking_specs' into feature/flagging_tracking_specs