New (unfinished) map

Old map, and huge version, are still on dropbox