Big update
Move away from InheritedResources