Closes #30. Closes #25