More updates to match scouting. Cycles are saving internally now.