closes #2 and #3