Chapter 2 & 3

Decorator pattern still needs work