move calculus code. add relational programming.