committing some chapter 5 goodness