Further fleshing out whiskey behavior.