Permissions, locking revamped, revert started