Added rudimentary calculator