made a bunch of tests pass - broke a few others.... doh.