still working on editor
editor ready for testing