Eventually I'll probably wind up completely rewriting it from little tests, the way I should have in the first place;
This reminds me of one of my favorite quotes, from horse trainer Pat Parelli:
If you take the time it takes, it takes less time! Sorry fro the hijack from the scantily-clad girls thread.