Tests passing. Relates to #6.