[#32] Finished issue 32 edit and add working