Added basic calculator class