Some work on refactored editor