Map editor

Merging.