squashed bugs ... and hopefully didn't add more! Is there TDD in my future?