This closes #9 and closes #10.