Testing the code

I'm currently running some tests on the code and am only submitting this
because it's meant to be a short test and the code should be restored
fairly soon. If you're using it, please shoot me an email and I'll send
you a version w/out the testing portions.