Some formatting, extra debugging output, TODO's.
Added sample test for easier creation of new tests.
Added test for parallelism.

Amazingly, it seems to work!