Final changes...to support weight history (and graph)