[Tech Debt]: Implemented add/subtract arithmetic