Master

Merging edit functionality