I'll take a look if I have time (I probably won't, or will take a long time to get around to it, but the desire to contribute is there)