new style contracts
v2 tests passing
1.0.0