Closes #2, and also closes #3. Bizzarely, the first issue isn't even on my agenda yet.