New map, cameras still need doing though.
Merge pull request #56 from Glloyd/Mapping

New map, cameras still need doing though.