diff --git a/src/hungarian/ParadigmsHun.gf b/src/hungarian/ParadigmsHun.gf
index a8783faa8..247fe301f 100644
--- a/src/hungarian/ParadigmsHun.gf
+++ b/src/hungarian/ParadigmsHun.gf
@@ -22,6 +22,12 @@ oper
     mkN : (férfi : Str) -> (harm : Harmony) -> (ak : Str) -> N ; -- Noun with unpredictable vowel harmony and plural allomorph
   } ;
 
+  mkPN : overload {
+    mkPN : Str -> PN ; -- Singular PN out of a string
+    mkPN : Str -> Number -> PN -- PN with a given number
+    -- mkPN : N -> Number -> PN ;
+    } ;
+
 --2 Adjectives
 
   mkA : overload {
@@ -127,8 +133,11 @@ oper
     mkN2 : N   -> N2 = \n -> lin N2 n ;
    } ;
 
-  -- mkPN = overload {
-  --   } ;
+  mkPN = overload {
+    mkPN : Str -> PN = \s -> lin PN (defNP s Sg) ;
+    mkPN : Str -> Number -> PN = \s,n -> lin PN (defNP s n) ;
+    -- mkPN : N -> Number -> PN ;
+    } ;
 
   mkA = overload {
     mkA : (adj : Str) -> A = \s -> lin A (mkAdj s) ;
diff --git a/src/hungarian/ResHun.gf b/src/hungarian/ResHun.gf
index 30913433b..4d6697933 100644
--- a/src/hungarian/ResHun.gf
+++ b/src/hungarian/ResHun.gf
@@ -32,6 +32,11 @@ oper
 
   indeclNP : Str -> NounPhrase = \s -> emptyNP ** {s = \\c => s} ;
 
+  defNP : Str -> Number -> NounPhrase = \s,n -> emptyNP ** {
+    s = (mkNoun s).s ! n ;
+    n = n ;
+    objdef = Def ;
+    } ;
 --------------------------------------------------------------------------------
 -- Pronouns
 
diff --git a/src/hungarian/StructuralHun.gf b/src/hungarian/StructuralHun.gf
index 32161539a..c74115449 100644
--- a/src/hungarian/StructuralHun.gf
+++ b/src/hungarian/StructuralHun.gf
@@ -85,12 +85,6 @@ lin somebody_NP = defNP "" N.NumSg ;
 -}
 lin something_NP = defNP "valami" Sg ;
 
-oper
-  defNP : Str -> Number -> NP = \s,n -> emptyNP ** {
-    s = (mkNoun s).s ! n ;
-    n = n
-  } ;
-
 -------
 -- Prep