Closes #7 and closes #9