More work on granular access.
Trying to merge.