Edit functionality working and tested