Unify the map into the list data structure.

This will make something easier, I swear!