         (quaff-only-adjacent-cell state)
       (and (= num-adjacent-dangerous-quaffable-cells 1)
            (zero? num-adjacent-quaffable-cells))
-        (rw/assoc-current-state state :quaff-popover)
+        (-> state
+          (assoc-in [:world :popover-message] quaff-popover-message)
+          (rw/assoc-current-state :quaff-popover))
       (or (> num-adjacent-quaffable-cells 1)
           (> num-adjacent-dangerous-quaffable-cells 1))
         (-> state

    (log/info "player-adj-xys" (rw/player-adjacent-xys state))
    (update-in state [:world :player :thirst] (fn [thirst] (min 0 (- thirst water))))))

(defn quaff-select
  "Select the next state depending on what quaffable items are available."
  [state]


(defn quaff-cell-at-pos
  ([state]
  (-> state
    (update-in [:world :player :thirst] (fn [thirst] (min 0 (- thirst 10))))
    (rp/player-update-hp (fn [hp] (max (- hp 10) 0)))
    (rw/assoc-current-state :normal)))
  ([state {x :x y :y}]
  (if-let [water (get (rw/get-cell state x y) :water)]
    (do (log/info "Drinking potable water")
