Still working on the rework, got the skeleton down now adding the math.