Worked some.
Merge branch 'master' into stephen
Fixed requests controller.