Adds back in map editing functionality, tests still commented out.