Resolves Part 1 of issue #2.