Follow-up on PR#1

So I started looking over your PR, then just kept running with this.

Take from it what you will.