Add various recompute functionality...