Zee destroys everything

I was supposed to review your code Friday and didn't get to it.

Here's a pull request with some tests and refactorings instead.