Finished the map function...