Completed the scaffolding, following the guide in Chapter 6