Tools Chapter Transitions

These changes from Cody are ready for master. Thanks.