This closes #13. This closes #12