QS-2815 Basic math operations in ECLQS-2815 almost done