More work on edit subsystem