Second commit, with building blocks further established.