closes #4, #5