Last commit before completely reworking calculator