I'll do this later, as QA is complete and the map is functional.