Calcv2

Fixes #18