Addresses #86 on refactor branch.