Mrtyler dont blow chunks

I did some refactoring in preparation for working on #156. I'm not sure if there's anything we can do to fix that bug, but this refactor and test coverage is worthwhile.