Closes #26. Work on #25