The mapping update

This mapping update places maps on all the secondary pages as well as makes the data nicer for mapping

Closes #9
Closes #12
Closes #22