Add comments, and re-org.