Initial work on editor