finished calculation helper refactoring

- you can now run calculations with primitive types

Signed-off-by: Chris Jones <chris@jonezy.org>