start working on update perms stuff; move a bunch of stuff around in the process