New map, cameras still need doing though.
Ugly, but I had Glloyd's map on my master branch by accident.
Merge branch 'master' of https://github.com/AndroidSFV/UMcS