Add resources module

Add resources module
Bug fixes
Merge branch 'add-resources'