Updates to editor...  Still incomplete.