Closes #11 and Closes #12