Closes #3. Covered new code.