OK, updated first post with first go at the map.