Closes #10. The dangers of refactoring without a proper IDE or decent test coverage...