WIP - Add grant approval, scope.Add, tests