Did stuff to support map editor eventually