Working on parsing/building/modifying maps, and interface changes