Resque 2 fixer

Resque2 branch is currently failing, this is WIP branch to attempt to fix it