Stop in for a cup of coffee

Did a little more work on this today.