Closes #19.

So much redundancy.