Chapter 7 RC1

I need to do an --arp pass on everything