Redid everything to use dictionaries for the MAAC