Closes #7. Closes #8.