First pass at moving to resources.
Deprecate old ways.