dev: refactor out the map and cells concept.
dev: refactor map