Closes #7, closes #13