Chapter 2 done
Modified parser to use a fold