Lot's of work here...

We have basic functionality back, although one of the tests that should be passing right now is failing.
The include test is still failing as well, but I haven't even attempted at getting code tags working yet.