504 edit link

Closes #643, Closes #611, Closes part 1 of #504 (part 2 is blocked)