1. Changes to compile faster
2. Functions and decision tree for keeping non-team flags
   Partially completed