added setters and getters and calculator methods