Second draft commit. More comments.