closes #12, closes #11