closes #3
addresses and possibly closes #1