I'm pretty happy with this now. If anyone wants to have a look at this, can they do so or let me know they're going to within the next 24 hours. Otherwise I plan to move into commit mode with it.
I just came to the office today to double check this patch. I probably can
finish it very soon. But if you are willing to commit it sooner, I am totally
