Finished second MapEdit refactor