Update to use local resources
Merge pull request #651 from achamely/core

Update to use local resources