Finished draft of 1-3

Except for 3.2.7 (Summary)