closes #6
closes #4