re-org is almost done, a few issues to work out with movement in the map.js