Sure, this patch is just a quick hack for now, not really ready for review.  I was more hoping for suggestions on how to fix the real issues, by throwing up the test results.  Also, if anyone else was interested in pitching in, they could use this to get started.