closes #3
closes #9