Halfway through 2.0 - Class needs more testing