ok, thanks.  Up to you if you want to do this now or later @vStone, since I trust you're tidying up apache class related things later.