Closes #11, closes #12