Chapter 3 done

Review please
Nice optional input