Started to work on edit functionality