Close to finalized API for Calculus package