Ajd chapter7

Chapter 7 ready
Neat.