Closes #1, Closes #2