Combofix

I haven't really reviewed this, but hopefully this will get the tests passing.