Added edit-on-click... it might even work!