Read PLAN.md and do step 3 only.

Touch only the files step 3 lists. If it needs another file, stop and tell
me why instead of editing it.

When you're done, run `python -m pytest -q` and `git status --short`, show
me both outputs, and stop. Don't start step 4.
