Refactoring, progress on editor, regress on vis