Closes #1, #7