Stop in for a cup of coffee

Barracuda is moved into shop. Diff is out and almost out of the way.