Iterating on a lot of access authorization query stuff. This is all
going to have to be changed later but for now, we'll go with it.
merge