Still ironing out bugs in calctools

Signed-off-by: shrimpboyho <shrimpboyhoftw@gmail.com>