First push of calc functionality