Switched maps to be generated in the map dictionary

Maps are now being stored in the map dictionary and recalled
appropriately.