Various changes and updates.  Working through the changes required to fix up the differences between my old smart pointers and raw pointer solution.