Calc

Merge basic calc functionality and unified testdata into master.