Continued work on populateMap()