Challenge 21
Fix re-init
Challenge 22
Change visibility of state so it can be overridden in challenge 23
Challenge 23