Reread sections 1.1 and 1.2; added TODOs