even moar resource refactoring