Getting a little further with the test suite. Worked out a really annoying bug.