Closes #2, #3