Done some more handiwork and blocked concurrent node edits (form)