Rbm

Hope this ends up a new PR (relatively new to GH). 
Yeh I'll close it since the changes to the tests seem to have made it over here.  I'll push the class name change onto this branch.