Lots of Testing. Lots of bugs fixed.

It still isn't running. But I sure squashed a lot of bugs.