Maybe you could post the new code as well so I can have a stab at running the test suite against it and possibly fixing it?

Makeshifts last the longest.