Early draft (cont'd).
Need a commit.