More updating, working on improving summing, etc.