Added calculator stuff