Move code around. Add comments. Fix Andrews bug.
Add test to catch a bug.