Wrapped chapter 2 into own module file