Integration with calc-api complete. closes #8