Forgot values!
Updated modules to include values
Merge branch 'develop'