Closes #6, #11