Work on #1.
Closes #5