Map wrapping complete. TODO: Submission QA/light refactor.