Resoources mega-refactor part way done