moved forward in time to Ch. 9 codebase