Redid some of the data structures prior to implementing the match history API