WIP - resource refactor