closes #1 closes #2