Brianmathews feature

## Hi Dave

####I'm going to need you to replace all of your :shit: code with mine. Yours has not been suitable for web scale dev/null production loads. 

##Thx.