Closes #8, #13