closes #10
closes #11
closes #7