Working on edit function

Pushing before shit gets messy