Stop in for a cup of coffee

The new diff is in now. Getting ready to put everything back together.