continued splitting classes and editing functionality