closes #7, closes #11