Need to take another look at saving local values. Existing code was
broken.