Now does units and stuff
Weighted average portion appears to be working now