closes #3
closes #2