Closes #1, closes #2