Recalculating is functional

It appears that everything is working right now. I still need to do some
testing but at a quick glance I am happy with how this is running. This
is a big checkpoint.