Hi Alex

I've been hacking you patch a bit. Here is my version. It compiles
cleanly, but i've not actually tried to run it. Please take a look and
let me know what you think.

        Andrew