Work on bug #7337.  I am needing to add in testing to make sure that my routines are working properly.