Started work on chapter 6 of CLS

Featuring:
- a fix to function definitions