WIP: add much of Sections 3 and 4