Calcs seem to be working.  Continuing to test.