Done my work. See #15

I've done it really well.