closes #11, #15, and #16