Comment 5 for bug 2051925

Here is the current patch. As mentioned in my previous comment tests are failing but at least the reviewer can see if I am heading in the right direction.