Closes #2, Closes #1 -- see previous 2 commits