update middleware
Merge branch 'mikedev'
Merge branch 'scott_dev'
general refactoring of helpers and helper implementations
Merge branch 'mikedev'
Merge branch 'scott_dev'
Merge branch 'scott_dev'