Ch. 7 begun

(only commiting so I can sync with upstream)