this is broken but headed in the right direction
Merge branch 'master' of https://github.com/nvcook42/mongo
merge in HK's changes