Stop in for a cup of coffee

Well, shifter works now. And trimmed it up.