Working on editing and collapsing