Starting to rework the way the map method works to speed it up.