diff --git a/typeclasses/consumables.py b/typeclasses/consumables.py
index 855e655..583abbb 100755
--- a/typeclasses/consumables.py
+++ b/typeclasses/consumables.py
@@ -121,7 +121,7 @@ class Producer(Object):
 # ----------------------------------------------------------------------
 
 TEACUP_DESCS = [
-    "A rustic, clay teacup carefully crafted on a wheel. Beautiful [dark red ^ olive green ^ navy blue}} glaze.",
+    "A rustic, clay teacup carefully crafted on a wheel. Beautiful {{dark red ^ olive green ^ navy blue}} glaze.",
     "A fine example of Royal Albert teacup, sporting a design of violet azaleas. Perfect for a black tea.",
     "A Wings of Grace style teacup with blue butterflies. Perfect for some Earl Grey.",
     "A dark brown Yixing clay teacup. Perfect for an Oolong tea.",
@@ -178,6 +178,7 @@ class Trolley(Producer):
     teacup_prototype = {
         "typeclass": "typeclasses.drinkables.TeaCup",
         "key": "teacup",
+        "aliases": "cup",
         "desc": "A nice teacup.",
     }
 
diff --git a/typeclasses/drinkables.py b/typeclasses/drinkables.py
index 037acdb..42f9562 100755
--- a/typeclasses/drinkables.py
+++ b/typeclasses/drinkables.py
@@ -104,6 +104,13 @@ class Teapot(Object):
         self.location.msg_contents(f"{drinker.name} makes a pot of tea.", exclude=drinker)
 
     def do_fill(self, drinker):
+        teatype = self.db.tea_type
+        if not teatype:
+            drinker.msg("You need to |gmake tea|n first.")
+            return
+
         teacup = drinker.has("teacup")
         if teacup:
-           teacup.do_fill(drinker, self.db.tea_type, TEA_TYPES[self.db.tea_type])
+            teacup.do_fill(drinker, teatype, TEA_TYPES[teatype])
+        else:
+            drinker.msg("You need to |gget teacup|n first.")
diff --git a/world/version1.ev b/world/version1.ev
index 2b48874..848e573 100644
--- a/world/version1.ev
+++ b/world/version1.ev
@@ -45,14 +45,34 @@ Spectacles perched precariously on the end of his hooked nose, wobble with his h
 
 
 
-# And his spells:
+# And his special teacup:
+
+
+# [[file:../../../Dropbox/org/projects/mud.org::*Character: Dabble][Character: Dabble:5]]
+@create teacup;cup : typeclasses.drinkables.TeaCup
+#
+@desc teacup = A rustic teacup crafted from clay etched with leaves and runes, with an olive green and brown glaze.
+# Character: Dabble:5 ends here
+
+
+
+# Let’s make him a wizard:
 
 
 # [[file:../../../Dropbox/org/projects/mud.org::*Character: Dabble][Character: Dabble:6]]
+@update self = typeclasses.characters.Wizard
+# Character: Dabble:6 ends here
+
+
+
+# And his spells:
+
+
+# [[file:../../../Dropbox/org/projects/mud.org::*Character: Dabble][Character: Dabble:7]]
 @set self/disappear_msg = "After a raspberry sound, the gnome, Dabbler, disappears in a wisp of smoke."
 #
 @set self/reappear_msg = "{{White ^ Light blue ^ Gray}} mist appears...along with the smell of sulphur... ;; When the smoke clears, an old gnome {{emerges ^ materializes ^ shows up, looking a bit confused}}."
-# Character: Dabble:6 ends here
+# Character: Dabble:7 ends here
 
 
 # Rename the Limbo (or starting place) with the name *Forest*. Note the term =mp01= as a global label that matches my map.