More work on bug #7337.  Still putting pieces into place to get a PTO calculation.