Major permission reworks, still in progress