Finished non-transformation math first pass. Now need tests