Changed some code in calculator class.
Got generally frustrated