Ryan's chapter 7 stuff

elegant