Really closes #7