starting to implement an edit mode (draft)