Working on mapeditor - waiting for bugfix