made some progress have the math pretty well thought out cleaning up some too