include Calculator in capture (calc needs work still)