initial work on switch to inherited_resources
Merge branch 'use_inherited_resources'