Mapping

Hopefully the last mapping edit I have to make for awhile.