more progress on editor
everything pretty much works