passing tests - not quite done with v2.0.0 though
Getting rid of `done` (replaced with `count` introspection), and finishing 2.0.0