Closes #18 and #37. Closes #10