basic editing functionality working