Remove addition modulo operation for now
Add distributive properties
Without tests for now