Massive changes made to match scouting. Ran lint checks.