no more class inheritance. But things are broken. We will fix them based on the new mocha tests

This commit was sponsored by The Hoodie Firm.
You can hire The Hoodie Firm:
http://go.hood.ie/thehoodiefirm