Arithmetic appears to work
prep makefile for merge to master