2.0

Huge cleanup + 100% test coverage
Also bigger boxes, less code