V2.1 Turn changed + Tracking update

-Made so saves info on turn to better handle finding a cup during a turn
-Grouped tracking info into a struct for clarity