[VERSION] 2.0b1. Rewrite of v1.x. Tests passing.