Good basis of Chapter 1 now

Moving some stuff into Chapter 2 / Review