inital commit + finished Chapter 3