Closes #2 by implementing feature.