started @calculus_operator
try combining
synched types
moved constructors and amcros
Moved wrapper routines
fixed typo