Working on fixing display/save and starting edit/delete