began work on math portion
merged
trying to merge