Adding basic calc functions
Merged basic + advanced commands