basic layout and test refactor, finished first part of chapter 5
finished chapter 5