Begin refactoring permissions