Have implemented expressions yet (added TODO w/ throw) will do when calc is added.