Editor

This is part of #238, #169