diff --git a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
index 118cb282..6471747f 100644
--- a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
+++ b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy
@@ -14,7 +14,7 @@ label nt_pr_teach_start:
 
     if states.ton.tier == 1:
 
-        if nt_pr_teach.points == 0:
+        if not _events_completed_any:
             ton "So, what's the plan?" ("open", "base", "base", "mid")
             gen "The plan?" ("base", xpos="far_left", ypos="head")
             ton "You know, how does this go down?" ("soft", "base", "base", "mid")
@@ -65,7 +65,7 @@ label nt_pr_teach_start:
 
     elif states.ton.tier >= 2:
 
-        if nt_pr_teach.points == 0: # Tell her to be even lewder for the next level of favors.
+        if not _events_completed_any: # Tell her to be even lewder for the next level of favors.
             gen "Would you like to give some boys detention again?" ("base", xpos="far_left", ypos="head")
             ton "And what would you suggest I do with them?" ("horny", "narrow", "base", "mid")
             ton "Make them show me their dicks?" ("horny", "narrow", "base", "R")
@@ -84,13 +84,9 @@ label nt_pr_teach_start:
 
     # Tonks leaves
 
-    $ nt_pr_teach.inProgress = True
-
     call ton_walk(action="leave")
     jump end_tonks_event
 
-
-
 ### Tier 1 ###
 
 label nt_pr_teach_T1_E1: #Tier 1 - Event 1 - Slytherin boy
@@ -98,22 +94,24 @@ label nt_pr_teach_T1_E1: #Tier 1 - Event 1 - Slytherin boy
     ton "Hello, [name_genie_tonks]." ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
     ton "I'm back with my report..." ("horny", "narrow", "base", "mid")
 
-    if states.ton.public_level <= 3: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"How was your day?\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "I had some fun with that Slytherin boy again..." ("horny", "base", "angry", "mid")
                 ton "Gave him a couple of points for his house." ("open", "base", "base", "R")
                 gen "Well done, [name_tonks_genie]... We'll talk next time." ("base", xpos="far_left", ypos="head")
                 ton "Yes, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid")
-                call increase_house_points("s", 20)
+                $ slytherin += 20
+
                 if states.ton.public_level < 4: # Points til 4.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
+
                 jump end_tonks_event
 
     gen "How were your... \"extra curricular activities\" today?" ("base", xpos="far_left", ypos="head")
@@ -159,7 +157,7 @@ label nt_pr_teach_T1_E1: #Tier 1 - Event 1 - Slytherin boy
 
     # Tonks leaves
 
-    call increase_house_points("s", 20)
+    $ slytherin += 20
 
     if states.ton.public_level < 4: # Points til 4.
         $ states.ton.public_level += 1
@@ -167,14 +165,11 @@ label nt_pr_teach_T1_E1: #Tier 1 - Event 1 - Slytherin boy
     call ton_walk(action="leave")
     jump end_tonks_event
 
-
 label nt_pr_teach_T1_E2: # Tier 1 - Event 2 - Racenclaw boy
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 3: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"How was your day?\"":
@@ -184,9 +179,12 @@ label nt_pr_teach_T1_E2: # Tier 1 - Event 2 - Racenclaw boy
                 ton "And he earned a bunch of points from me." ("base", "happyCl", "base", "mid")
                 gen "Well done, [name_tonks_genie]... We'll talk next time." ("base", xpos="far_left", ypos="head")
                 ton "Yes, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid")
-                call increase_house_points("r", 10)
+
+                $ ravenclaw += 10 
+
                 if states.ton.public_level < 4: # Points til 4.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -227,7 +225,7 @@ label nt_pr_teach_T1_E2: # Tier 1 - Event 2 - Racenclaw boy
 
     # Tonks leaves
 
-    call increase_house_points("r", 10)
+    $ ravenclaw += 10
 
     if states.ton.public_level < 4: # Points til 4.
         $ states.ton.public_level += 1
@@ -235,14 +233,11 @@ label nt_pr_teach_T1_E2: # Tier 1 - Event 2 - Racenclaw boy
     call ton_walk(action="leave")
     jump end_tonks_event
 
-
 label nt_pr_teach_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys. Guess who...
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 3: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"How was your day?\"":
@@ -254,8 +249,10 @@ label nt_pr_teach_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys. Guess who...
                 ton "They practically begged me if they could do it for free anyway..." ("open", "base", "base", "R")
                 gen "Well done, [name_tonks_genie]... Until next time." ("base", xpos="far_left", ypos="head")
                 ton "Have a good night, [name_genie_tonks]." ("base", "happyCl", "base", "mid")
+
                 if states.ton.public_level < 4: # Points til 4.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -297,21 +294,19 @@ label nt_pr_teach_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys. Guess who...
 
     # Tonks leaves
 
-    call increase_house_points("g", 20)
+    $ gryffindor += 20
+
     if states.ton.public_level < 4: # Points til 4.
         $ states.ton.public_level += 1
 
     call ton_walk(action="leave")
     jump end_tonks_event
 
-
 label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 3: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"How was your day?\"":
@@ -322,9 +317,12 @@ label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl
                 ton "But she was very happy about the points." ("base", "base", "angry", "mid")
                 gen "Well done, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 ton "Yes, [name_genie_tonks]. Good night." ("silly", "happyCl", "base", "mid")
-                call increase_house_points("s", 20)
+                
+                $ slytherin += 20
+
                 if states.ton.public_level < 4: # Points til 4.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -391,7 +389,7 @@ label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl
 
     # Tonks leaves
 
-    call increase_house_points("s", 20)
+    $ slytherin += 20
 
     if states.ton.public_level < 4: # Points til 4.
         $ states.ton.public_level += 1
@@ -399,17 +397,13 @@ label nt_pr_teach_T1_E4: # Tier 1 - Event 4 - Slytherin girl
     call ton_walk(action="leave")
     jump end_tonks_event
 
-
-
 ### Tier 2 ###
 
 label nt_pr_teach_T2_E1: # Tier 2 - Event 1 - Hufflepuff girl
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Guess what happened, [name_genie_tonks]!" ("base", "happyCl", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if nt_pr_teach.points <= 4 and states.ton.public_level <= 8: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"................\"":
@@ -420,9 +414,12 @@ label nt_pr_teach_T2_E1: # Tier 2 - Event 1 - Hufflepuff girl
                 ton "And I didn't use my wand to clean it..." ("horny", "base", "angry", "mid")
                 gen "Very good, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 ton "Thank you, [name_genie_tonks]. Until next time..." ("base", "base", "base", "mid")
-                call increase_house_points("h", 40)
+                
+                $ hufflepuff += 40
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -487,7 +484,7 @@ label nt_pr_teach_T2_E1: # Tier 2 - Event 1 - Hufflepuff girl
 
     # Tonks leaves
 
-    call increase_house_points("h", 40)
+    $ hufflepuff += 40
 
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
@@ -498,15 +495,13 @@ label nt_pr_teach_T2_E1: # Tier 2 - Event 1 - Hufflepuff girl
 
 label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
     #TODO Have a few drops of cum on her clothes when she comes in
-    $ tonks.set_cum(legs="light")
-    $ tonks.set_cum(pussy="light")
+    $ tonks.set_cum(hair="light")
+    $ _cum_known=False
 
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hello, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if nt_pr_teach.points <= 4 and states.ton.public_level <= 8: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"How was your day?\"":
@@ -516,9 +511,12 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
                 ton "Every time he shot out some cum for me I gave him five points..." ("horny", "base", "angry", "mid")
                 gen "I bet he earned quite a lot today. Well done, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 ton "That he did, [name_genie_tonks]... See you next time..." ("base", "base", "base", "mid")
-                call increase_house_points("r", 20)
+                
+                $ ravenclaw += 20
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -535,15 +533,16 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
 
     menu:
         "-Let her know about the cum-":
-            $ choice_flag=True
+            $ _cum_known=True
+
             gen "You do know that you've got some cum on you?" ("base", xpos="far_left", ypos="head")
             ton "*Hmm*?..." ("base", "base", "base", "down")
             ton "Oh..." ("mad", "base", "shocked", "down")
             ton "That cheeky bugger! I can't believe he actually shot it that far..." ("open", "base", "base", "down")
             gen ".................." ("base", xpos="far_left", ypos="head")
             ton "Best to start from the beginning..." ("soft", "closed", "base", "mid")
+
         "-Ignore it-":
-            $ choice_flag=False
             pass
 
     ton "So, I spent a little time with my favourite Ravenclaw student today..." ("soft", "narrow", "base", "down")
@@ -584,7 +583,7 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
     ton "*Ugh*... I definitely have to go rub one out after this..." ("mad", "base", "base", "ahegao")
     ton "See you, [name_genie_tonks]." ("base", "narrow", "base", "L")
 
-    if choice_flag:
+    if _cum_known:
         gen "Are you going to do anything about the cum?" ("base", xpos="far_left", ypos="head")
         ton "*Hmm*?... The cum?" ("upset", "base", "worried", "down")
         ton "Oh... Why bother..." ("soft", "base", "base", "down")
@@ -596,12 +595,15 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
 
     # Tonks leaves
 
-    call increase_house_points("r", 20)
+    $ ravenclaw += 20
 
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
     call ton_walk(action="leave")
+
+    $tonks.set_cum(None)
+
     jump end_tonks_event
 
 
@@ -609,21 +611,23 @@ label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "[name_genie_tonks]..." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if nt_pr_teach.points <= 4 and states.ton.public_level <= 8: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"How was your day?\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "This Slytherin dickhead was asking for trouble again!" ("mad", "base", "angry", "R")
                 ton "I did my best to punish him... thoroughly..." ("horny", "base", "angry", "mid")
                 gen "Very good, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 ton "*Mhmm*... Until next time, [name_genie_tonks]..." ("base", "happyCl", "base", "mid")
-                call increase_house_points("s", 20)
+                
+                $ slytherin += 20
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -670,7 +674,7 @@ label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy
     call bld
     gen "(This bitch might be crazier than I thought...)" ("base", xpos="far_left", ypos="head")
 
-    call increase_house_points("s", 20)
+    $ slytherin += 20
 
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
@@ -678,26 +682,27 @@ label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy
     call ton_walk(action="leave")
     jump end_tonks_event
 
-
 label nt_pr_teach_T2_E4: # Tier 2 - Event 4 - Slytherin girl
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if nt_pr_teach.points <= 4 and states.ton.public_level <= 8: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"How was your day?\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "This cute Slytherin girl earned herself a couple of points from me today..." ("open", "base", "base", "R")
                 ton "She's really starting to get into it!" ("base", "base", "angry", "mid")
                 gen "Good work, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 ton "Thank you... Have a good night, [name_genie_tonks]..." ("base", "base", "base", "mid")
-                call increase_house_points("s", 20)
+                
+                $ slytherin += 20
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -741,7 +746,7 @@ label nt_pr_teach_T2_E4: # Tier 2 - Event 4 - Slytherin girl
 
     # Tonks leaves
 
-    call increase_house_points("s", 20)
+    $ slytherin += 20
 
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
diff --git a/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy b/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
index 230d072b..4f950950 100644
--- a/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
+++ b/game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy
@@ -11,15 +11,17 @@ label nt_pr_grope_start:
 
     if states.ton.tier == 2:
 
-        if nt_pr_grope.points == 0:
+        if not _events_completed_any:
             gen "Ready for the next step?" ("base", xpos="far_left", ypos="head")
             ton "*Mmmm*... You make it sound so ominous." ("soft", "narrow", "base", "mid")
             ton "What shall I do next with my students..." ("soft", "narrow", "shocked", "R")
-            if nt_pr_kiss.counter == 0:
+
+            if not states.ton.ev.oral_practice.completed_once:
                 ton "Want me to make out with them?" ("horny", "narrow", "base", "mid")
                 gen "Maybe, but not right now..." ("base", xpos="far_left", ypos="head")
             else:
                 ton "Want me to make out with them again?" ("horny", "base", "angry", "mid")
+
             gen "I was thinking you could take a few of these boys to second base." ("base", xpos="far_left", ypos="head")
             ton "Second base?! Already?" ("open", "shocked", "shocked", "up")
             gen "We're trying to earn you a reputation as a favour trader." ("base", xpos="far_left", ypos="head")
@@ -44,9 +46,13 @@ label nt_pr_grope_start:
 
     elif states.ton.tier >= 3:
 
-        if nt_pr_grope.points == 0: # Tell her to be even lewder for the next level of favors.
-
-            "Dev Note" "Not in 1.37 - Write 2nd intro."
+        if not _events_completed_any: # Tell her to be even lewder for the next level of favors.
+            gen "I'd like you to go out and have some handsy fun with your students." ("base", xpos="far_left", ypos="head")
+            ton "Just like that? " ("open", "base", "raised", "mid")
+            gen "Just like that, but I want you to be more handsy this time." ("grin", xpos="far_left", ypos="head")
+            ton "I can certainly do that..." ("horny", "base", "base", "mid")
+            ton "See you after class...{heart}" ("base", "happyCl", "base", "mid")
+            gen "See ya!" ("grin", xpos="far_left", ypos="head")
 
         else: # Repeat
             gen "Would you like to mess around with your students again?" ("base", xpos="far_left", ypos="head")
@@ -56,36 +62,35 @@ label nt_pr_grope_start:
             gen "I'll see you after class..." ("base", xpos="far_left", ypos="head")
             ton "Yes, [name_genie_tonks]...{heart}" ("base", "base", "base", "mid")
 
+    $ states.ton.ev.hands_on_lessons.completed_once = True
+
     # Tonks leaves
-
-    $ nt_pr_grope.inProgress = True
-
     call ton_walk(action="leave")
     jump end_tonks_event
 
-
-
 ### Tier 1 ###
 
-label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy
+label nt_pr_grope_T2_E1: # Tier 1 - Event 1 - Slytherin boy
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "Remember that Slytherin boy?..." ("horny", "base", "angry", "mid")
                 ton "I let him play with his favourite pair of tits again..." ("base", "base", "angry", "mid")
                 gen "Well done, [name_tonks_genie]... We'll talk next time." ("base", xpos="far_left", ypos="head")
                 ton "Yes, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid")
-                call increase_house_points("s", 40)
+                
+                $ slytherin += 40
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -134,7 +139,8 @@ label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy
 
     # Tonks leaves
 
-    call increase_house_points("s", 40)
+    $ slytherin += 40
+
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
@@ -142,13 +148,11 @@ label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy
     jump end_tonks_event
 
 
-label nt_pr_grope_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
+label nt_pr_grope_T2_E2: # Tier 1 - Event 2 - Ravenclaw boy
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
@@ -158,9 +162,12 @@ label nt_pr_grope_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
                 ton "He almost suffocated himself in between my cleavage..." ("silly", "happyCl", "base", "mid")
                 gen "Well done, [name_tonks_genie]... We'll talk next time." ("base", xpos="far_left", ypos="head")
                 ton "Yes, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid")
-                call increase_house_points("r", 20)
+                
+                $ ravenclaw += 20
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -170,7 +177,7 @@ label nt_pr_grope_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
     gen "And your... other tasks?" ("base", xpos="far_left", ypos="head")
     ton "Oh, of course messing around with our students is a nice bonus!" ("grin", "narrow", "base", "mid")
     gen "Speaking of..." ("base", xpos="far_left", ypos="head")
-    ton "Don't worry, I've got a story for you, old man." ("base", "base", "annoyed", "mid")
+    ton "Don't worry, I've got a story for you, [name_genie_tonks]." ("base", "base", "annoyed", "mid")
     ton "Remember that shy Ravenclaw boy I had touch himself for me the other day?" ("base", "narrow", "base", "R")
     gen "Maybe, but go on..." ("base", xpos="far_left", ypos="head")
     ton "He stayed behind after class today..." ("open", "closed", "base", "mid")
@@ -219,7 +226,8 @@ label nt_pr_grope_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
 
     # Tonks leaves
 
-    call increase_house_points("r", 20)
+    $ ravenclaw += 20
+
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
@@ -227,24 +235,25 @@ label nt_pr_grope_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
     jump end_tonks_event
 
 
-label nt_pr_grope_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys
+label nt_pr_grope_T2_E3: # Tier 1 - Event 3 - Two Gryffindor boys
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "I let those two Gryffindors feel me up again..." ("open", "base", "base", "R")
                 ton "Of course they didn't get any points for it..." ("base", "base", "angry", "mid")
                 gen "Great job, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 ton "Thank you, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid")
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -290,13 +299,11 @@ label nt_pr_grope_T1_E3: # Tier 1 - Event 3 - Two Gryffindor boys
     jump end_tonks_event
 
 
-label nt_pr_grope_T1_E4: # Tier 1 - Event 4 - Slytherin girl
+label nt_pr_grope_T2_E4: # Tier 1 - Event 4 - Slytherin girl
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_grope.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
@@ -306,9 +313,12 @@ label nt_pr_grope_T1_E4: # Tier 1 - Event 4 - Slytherin girl
                 ton "She's the hardest nut to crack, I tell you..." ("open", "base", "worried", "R") # hardest instead of tough in the UK.
                 gen "You will have better luck next time, [name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
                 ton "I hope so too, [name_genie_tonks]... Have a good night." ("base", "base", "worried", "mid")
-                call increase_house_points("s", 40)
+                
+                $ slytherin += 40
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -356,31 +366,30 @@ label nt_pr_grope_T1_E4: # Tier 1 - Event 4 - Slytherin girl
 
     # Tonks leaves
 
-    call increase_house_points("s", 40)
+    $ slytherin += 40
+
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
     call ton_walk(action="leave")
     jump end_tonks_event
 
+### Tier 3 ###
+
+# label nt_pr_grope_T3_E1: # Tier 2 - Event 1
+#     #Begrudgingly talks about how pretty tonks is
 
 
-### Tier 2 ###
-
-label nt_pr_grope_T2_E1: # Tier 2 - Event 1
-    #Begrudgingly talks about how pretty tonks is
-
-
-label nt_pr_grope_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy again
-    #breastfeeding and mommy play
+# label nt_pr_grope_T3_E2: # Tier 2 - Event 2 - Ravenclaw boy again
+#     #breastfeeding and mommy play
 
 
 
-label nt_pr_grope_T2_E3: # Tier 2 - Event 3
-    #hufflepuff girl comes in asking for another favour
-    #ends up sucking tonks boobs
+# label nt_pr_grope_T3_E3: # Tier 2 - Event 3
+#     #hufflepuff girl comes in asking for another favour
+#     #ends up sucking tonks boobs
 
 
 
-label nt_pr_grope_T2_E4: # Tier 2 - Event 4 -
-    #Tonks has her a slyhterin girl sit there and do work while she has no top on
+# label nt_pr_grope_T3_E4: # Tier 2 - Event 4 -
+#     #Tonks has her a slyhterin girl sit there and do work while she has no top on
diff --git a/game/scripts/characters/tonks/events/requests/oral_practice.rpy b/game/scripts/characters/tonks/events/requests/oral_practice.rpy
index cd62048c..0c793539 100644
--- a/game/scripts/characters/tonks/events/requests/oral_practice.rpy
+++ b/game/scripts/characters/tonks/events/requests/oral_practice.rpy
@@ -11,22 +11,23 @@ label nt_pr_kiss_start:
 
     if states.ton.tier == 2:
 
-        if nt_pr_kiss.points == 0:
+        if not _events_completed_any:
             gen "Ready to try something a little different?" ("base", xpos="far_left", ypos="head")
             ton "*Mmmm*... Absolutely! This is the most fun I've had in years!" ("horny", "base", "base", "mid")
             ton "What did you have in mind?" ("base", "base", "shocked", "mid")
             gen "What do you think?" ("base", xpos="far_left", ypos="head")
-            if nt_pr_grope.points == 0:
+
+            if not states.ton.ev.hands_on_lessons.completed_once:
                 ton "I think making out with them would be really fucking hot..." ("horny", "base", "base", "R")
                 gen "Just kissing?" ("base", xpos="far_left", ypos="head")
                 ton "You don't understand...{w} The way I make out..." ("soft", "base", "base", "mid")
-                ton "It's way more intense than anything these students will have ever experienced..." ("base", "base", "annoyed", "stare")
+                ton "It's way more intense than anything these students would have ever experienced..." ("base", "base", "annoyed", "stare")
             else:
                 ton "I know you shot it down earlier... but I think a little making out would be really fucking hot..." ("horny", "base", "angry", "mid")
                 gen "*Pfft*... you're such a bad girl..." ("base", xpos="far_left", ypos="head")
                 gen "You've already gotten to second base! Let's not jump back to first!" ("base", xpos="far_left", ypos="head")
                 ton "You don't get it...{w} The way I make out..." ("horny", "base", "base", "R")
-                ton "It's way more intense than anything these students will have ever experienced..." ("base", "base", "angry", "mid")
+                ton "It's way more intense than anything these students would have ever experienced..." ("base", "base", "angry", "mid")
             gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
             gen "So you're not just going to give them a peck on the cheek, are you?" ("grin", xpos="far_left", ypos="head")
             ton "Oh no..." ("crooked_smile", "narrow", "base", "mid")
@@ -46,7 +47,7 @@ label nt_pr_kiss_start:
 
     elif states.ton.tier >= 3: # Not in 1.37
 
-        if nt_pr_kiss.points == 0: # Tell her to be even lewder for the next level of favors.
+        if not _events_completed_any: # Tell her to be even lewder for the next level of favors.
 
             gen "Would you like to help your students with their oral skills again?" ("base", xpos="far_left", ypos="head")
             ton "*Mmmm*, yes... Some of them are in dire need of some practice..." ("horny", "base", "raised", "mid")
@@ -61,7 +62,7 @@ label nt_pr_kiss_start:
 
     # Tonks leaves
 
-    $ nt_pr_kiss.inProgress = True
+    $ states.ton.ev.oral_practice.completed_once = True
 
     call ton_walk(action="leave")
     jump end_tonks_event
@@ -70,14 +71,12 @@ label nt_pr_kiss_start:
 
 ### Tier 1 ###
 
-label nt_pr_kiss_T1_intro_E1: # Tier 1 - Event 1 - Slytherin boy
+label nt_pr_kiss_T2_intro_E1: # Tier 1 - Event 1 - Slytherin boy
     #Gentle kissing
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
@@ -87,9 +86,12 @@ label nt_pr_kiss_T1_intro_E1: # Tier 1 - Event 1 - Slytherin boy
                 ton "He's getting quite good at it..." ("horny", "base", "base", "up")
                 gen "Well done, [name_tonks_genie]... We'll talk next time." ("base", xpos="far_left", ypos="head")
                 ton "Have a good night, [name_genie_tonks]." ("base", "happyCl", "base", "mid")
-                call increase_house_points("s", 40)
+                
+                $ slytherin += 40
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -136,7 +138,8 @@ label nt_pr_kiss_T1_intro_E1: # Tier 1 - Event 1 - Slytherin boy
 
     # Tonks leaves.
 
-    call increase_house_points("s", 40)
+    $ slytherin += 40
+
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
@@ -144,25 +147,27 @@ label nt_pr_kiss_T1_intro_E1: # Tier 1 - Event 1 - Slytherin boy
     jump end_tonks_event
 
 
-label nt_pr_kiss_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
+label nt_pr_kiss_T2_E2: # Tier 1 - Event 2 - Ravenclaw boy
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "Sorry I'm a bit late today..." ("open", "base", "base", "R")
                 ton "I was \"occupied\" kissing that little Ravenclaw boy again..." ("horny", "base", "angry", "mid")
                 gen "Very good, [name_tonks_genie]." ("base", xpos="far_left", ypos="head")
                 ton "Thank you, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid")
-                call increase_house_points("r", 20)
+                
+                $ ravenclaw += 20
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -208,7 +213,8 @@ label nt_pr_kiss_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
 
     # Tonks leaves.
 
-    call increase_house_points("r", 20)
+    $ ravenclaw += 20
+
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
@@ -216,27 +222,29 @@ label nt_pr_kiss_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
     jump end_tonks_event
 
 
-label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls
+label nt_pr_kiss_T2_E3: # Tier 1 - Event 3 - Slytherin girls
     #Tonks pays two best friends to make out
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "I gave those two Slytherin sluts detention again..." ("open", "base", "base", "R")
                 ton "Fuck, I came so hard watching them kiss!" ("base", "base", "base", "mid")
                 gen "You wouldn't believe how jealous I am!" ("base", xpos="far_left", ypos="head")
                 ton "You have no idea, [name_genie_tonks]!" ("base", "base", "angry", "mid")
                 ton "I better get going. Until next time!" ("base", "happyCl", "base", "mid")
-                call increase_house_points("s", 40)
+                
+                $ slytherin += 40
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -278,7 +286,8 @@ label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls
 
     # Tonks leaves.
 
-    call increase_house_points("s", 40)
+    $ slytherin += 40
+
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
@@ -286,26 +295,28 @@ label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls
     jump end_tonks_event
 
 
-label nt_pr_kiss_T1_E4: #Level 1 Event 4
+label nt_pr_kiss_T2_E4: #Level 1 Event 4
     #Tender make-out session with a Slytherin lesbian
     call ton_walk(action="enter", xpos="mid", ypos="base")
     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    if states.ton.public_level <= 7 and nt_pr_kiss.points < 4: # First time.
-        pass
-    else: # Repeat.
+    if _events_filtered_completed_all:
         menu:
             gen "(...)" ("base", xpos="far_left", ypos="head")
             "\"You are back!\"":
                 pass
+
             "\"Make it quick!\"":
                 ton "I kissed that cute little Slytherin girl..." ("open", "base", "base", "mid")
                 ton "She getting there!" ("base", "happyCl", "base", "mid")
                 gen "Very good, [name_tonks_genie]." ("base", xpos="far_left", ypos="head")
                 ton "Thank you, [name_genie_tonks]. Have a good night." ("base", "base", "base", "mid")
-                call increase_house_points("s", 40)
+                
+                $ slytherin += 40
+
                 if states.ton.public_level < 9: # Points til 9.
                     $ states.ton.public_level += 1
+
                 call ton_walk(action="leave")
                 jump end_tonks_event
 
@@ -353,7 +364,8 @@ label nt_pr_kiss_T1_E4: #Level 1 Event 4
 
     # Tonks leaves.
 
-    call increase_house_points("s", 40)
+    $ slytherin += 40
+
     if states.ton.public_level < 9: # Points til 9.
         $ states.ton.public_level += 1
 
@@ -362,87 +374,87 @@ label nt_pr_kiss_T1_E4: #Level 1 Event 4
 
 
 
-### Tier 2 ###
+### Tier 3 ###
 
-label nt_pr_kiss_T2_E1: # Tier 2 Event 1 # Not in use.
-    call ton_walk(action="enter", xpos="mid", ypos="base")
-    ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
+# label nt_pr_kiss_T3_E1: # Tier 2 Event 1 # Not in use.
+#     call ton_walk(action="enter", xpos="mid", ypos="base")
+#     ton "Hi, [name_genie_tonks]." ("horny", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
-    gen "How did your extracurricular activities pan out today?" ("base", xpos="far_left", ypos="head")
-    ton "Honestly? I don't think I've ever been as turned on in my life..." ("base", "base", "base", "mid")
-    ton "Fuck... It was incredible... the power I felt over him... it was intoxicating..." ("base", "base", "base", "mid")
-    gen "Care to elaborate?" ("base", xpos="far_left", ypos="head")
-    ton "Well, you know that stuck up little Slytherin I've been fooling around with?" ("base", "base", "base", "mid")
-    gen "The guy or the girl?" ("base", xpos="far_left", ypos="head")
-    ton "The boy." ("base", "base", "base", "mid")
-    gen "Yep, I think I remember them..." ("base", xpos="far_left", ypos="head")
-    ton "I asked them to stay back after classes again... Even if it was by staring at them during class..." ("base", "base", "base", "mid")
-    ton "Either way... He knew he had to stay behind to play with \"auntie\" Tonks..." ("base", "base", "base", "mid")
-    gen "Kinky..." ("base", xpos="far_left", ypos="head")
-    ton "Mmmm, I walked over to him slowly... Making sure I savoured that frightened look on his face..." ("base", "base", "base", "mid")
-    ton "Then, I got to his desk... I was half expecting him to blabber on about not deserving to be there..." ("base", "base", "base", "mid")
-    ton "But today he just looked up at me with a delectable mix of fear and anticipation..." ("base", "base", "base", "mid")
+#     gen "How did your extracurricular activities pan out today?" ("base", xpos="far_left", ypos="head")
+#     ton "Honestly? I don't think I've ever been as turned on in my life..." ("base", "base", "base", "mid")
+#     ton "Fuck... It was incredible... the power I felt over him... it was intoxicating..." ("base", "base", "base", "mid")
+#     gen "Care to elaborate?" ("base", xpos="far_left", ypos="head")
+#     ton "Well, you know that stuck up little Slytherin I've been fooling around with?" ("base", "base", "base", "mid")
+#     gen "The guy or the girl?" ("base", xpos="far_left", ypos="head")
+#     ton "The boy." ("base", "base", "base", "mid")
+#     gen "Yep, I think I remember them..." ("base", xpos="far_left", ypos="head")
+#     ton "I asked them to stay back after classes again... Even if it was by staring at them during class..." ("base", "base", "base", "mid")
+#     ton "Either way... He knew he had to stay behind to play with \"auntie\" Tonks..." ("base", "base", "base", "mid")
+#     gen "Kinky..." ("base", xpos="far_left", ypos="head")
+#     ton "Mmmm, I walked over to him slowly... Making sure I savoured that frightened look on his face..." ("base", "base", "base", "mid")
+#     ton "Then, I got to his desk... I was half expecting him to blabber on about not deserving to be there..." ("base", "base", "base", "mid")
+#     ton "But today he just looked up at me with a delectable mix of fear and anticipation..." ("base", "base", "base", "mid")
 
-    # Genie starts jerking off
+#     # Genie starts jerking off
 
-    #">Unable to help yourself any longer, you start to inconspicuously stroke your cock under your desk."
-    #ton "*tsk* *tsk* *tsk*...{w} Couldn't help yourself, could you?"
-    #gen "Can you blame me?" ("base", xpos="far_left", ypos="head")
-    #ton "I suppose not..."
-    #ton "Anyway, back to that cute little thing..."
+#     #">Unable to help yourself any longer, you start to inconspicuously stroke your cock under your desk."
+#     #ton "*tsk* *tsk* *tsk*...{w} Couldn't help yourself, could you?"
+#     #gen "Can you blame me?" ("base", xpos="far_left", ypos="head")
+#     #ton "I suppose not..."
+#     #ton "Anyway, back to that cute little thing..."
 
-    ton "Eventually I'd had enough of his eager expression..." ("base", "base", "base", "mid")
-    ton "I pounced upon him... Sitting down on his lap, pinning him to his chair and forcing my chest into his..." ("base", "base", "base", "mid")
-    ton "I could feel his heartbeat... It was so fast... Like a mouse..." ("base", "base", "base", "mid")
-    ton "Whispering in his ear I asked if he wanted a little kiss..." ("base", "base", "base", "mid")
-    ton "Making sure to let him know that I'd pay him plenty of points..." ("base", "base", "base", "mid")
-    ton "Just for a kiss..." ("base", "base", "base", "mid")
-    gen "*Mmmmm*..." ("base", xpos="far_left", ypos="head")
-    ton "Of course he said yes... Even if it was so faint I could barely hear it..." ("base", "base", "base", "mid")
-    ton "But once he said it... I was on him..." ("base", "base", "base", "mid")
-    ton "I pinned him down as I held his head in place..." ("base", "base", "base", "mid")
-    ton "Ugh... My tongue was going crazy..." ("base", "base", "base", "mid")
-    ton "I'm not sure if you remember this from school, sir, but I'm an Metamorphmagus..." ("base", "base", "base", "mid") # Note: I'd wait with adding Tonks' abilities and reserve them for the 2nd level of favors (longer tongue, bigger breasts...)
-    ton "Normally I just use that to blend in or for jokes..." ("base", "base", "base", "mid")
-    ton "But sometimes I use it to... Play around..." ("base", "base", "base", "mid")
-    ton "And all the excitement today may have caused me to lose control of my tongue..." ("base", "base", "base", "mid")
-    gen "Lose control of your tongue?" ("base", xpos="far_left", ypos="head")
-    ton "Ugh... it was so long..." ("base", "base", "base", "mid")
-    ton "It was like I was fucking that poor boys mouth with it..." ("base", "base", "base", "mid") # Note: This section is a bit too extreme for the first level.
-    ton "I wrapped his tongue in mine... stuck it down his throat..." ("base", "base", "base", "mid")
-    ton "Ugh... I even licked his face clean..." ("base", "base", "base", "mid")
-    ton "By the time I was done there wasn't a dry spot on his face..." ("base", "base", "base", "mid")
-    gen "*Argh*..." ("base", xpos="far_left", ypos="head")
-    ton "Poor thing... I think I broke him if I'm being honest..." ("base", "base", "base", "mid")
-    gen "That's it..." ("base", xpos="far_left", ypos="head")
-    ton "I thought he'd like it... but there were so many tears--" ("base", "base", "base", "mid")
+#     ton "Eventually I'd had enough of his eager expression..." ("base", "base", "base", "mid")
+#     ton "I pounced upon him... Sitting down on his lap, pinning him to his chair and forcing my chest into his..." ("base", "base", "base", "mid")
+#     ton "I could feel his heartbeat... It was so fast... Like a mouse..." ("base", "base", "base", "mid")
+#     ton "Whispering in his ear I asked if he wanted a little kiss..." ("base", "base", "base", "mid")
+#     ton "Making sure to let him know that I'd pay him plenty of points..." ("base", "base", "base", "mid")
+#     ton "Just for a kiss..." ("base", "base", "base", "mid")
+#     gen "*Mmmmm*..." ("base", xpos="far_left", ypos="head")
+#     ton "Of course he said yes... Even if it was so faint I could barely hear it..." ("base", "base", "base", "mid")
+#     ton "But once he said it... I was on him..." ("base", "base", "base", "mid")
+#     ton "I pinned him down as I held his head in place..." ("base", "base", "base", "mid")
+#     ton "Ugh... My tongue was going crazy..." ("base", "base", "base", "mid")
+#     ton "I'm not sure if you remember this from school, sir, but I'm an Metamorphmagus..." ("base", "base", "base", "mid") # Note: I'd wait with adding Tonks' abilities and reserve them for the 2nd level of favors (longer tongue, bigger breasts...)
+#     ton "Normally I just use that to blend in or for jokes..." ("base", "base", "base", "mid")
+#     ton "But sometimes I use it to... Play around..." ("base", "base", "base", "mid")
+#     ton "And all the excitement today may have caused me to lose control of my tongue..." ("base", "base", "base", "mid")
+#     gen "Lose control of your tongue?" ("base", xpos="far_left", ypos="head")
+#     ton "Ugh... it was so long..." ("base", "base", "base", "mid")
+#     ton "It was like I was fucking that poor boys mouth with it..." ("base", "base", "base", "mid") # Note: This section is a bit too extreme for the first level.
+#     ton "I wrapped his tongue in mine... stuck it down his throat..." ("base", "base", "base", "mid")
+#     ton "Ugh... I even licked his face clean..." ("base", "base", "base", "mid")
+#     ton "By the time I was done there wasn't a dry spot on his face..." ("base", "base", "base", "mid")
+#     gen "*Argh*..." ("base", xpos="far_left", ypos="head")
+#     ton "Poor thing... I think I broke him if I'm being honest..." ("base", "base", "base", "mid")
+#     gen "That's it..." ("base", xpos="far_left", ypos="head")
+#     ton "I thought he'd like it... but there were so many tears--" ("base", "base", "base", "mid")
 
-    #gen "UGH... THERE IT IS!!!" ("grin", xpos="far_left", ypos="head")
-    # Genie cums
-    #">You begin firing a load of under your desk, making a dull thud with each blast hitting against the backboard..."
+#     #gen "UGH... THERE IT IS!!!" ("grin", xpos="far_left", ypos="head")
+#     # Genie cums
+#     #">You begin firing a load of under your desk, making a dull thud with each blast hitting against the backboard..."
 
-    ton "*Mmmm*, looks like you enjoyed our little lesson as well..." ("base", "base", "base", "mid")
-    gen "Ugh... can you blame me? That was... Ugh..." ("base", xpos="far_left", ypos="head")
-    ton "I told you I knew how to kiss..." ("base", "base", "base", "mid")
-    gen "I believe you... that'll be all for now..." ("base", xpos="far_left", ypos="head")
-    gen "I need to clean up..." ("base", xpos="far_left", ypos="head")
-    ton "Very well... Thank you, sir." ("base", "base", "base", "mid")
+#     ton "*Mmmm*, looks like you enjoyed our little lesson as well..." ("base", "base", "base", "mid")
+#     gen "Ugh... can you blame me? That was... Ugh..." ("base", xpos="far_left", ypos="head")
+#     ton "I told you I knew how to kiss..." ("base", "base", "base", "mid")
+#     gen "I believe you... that'll be all for now..." ("base", xpos="far_left", ypos="head")
+#     gen "I need to clean up..." ("base", xpos="far_left", ypos="head")
+#     ton "Very well... Thank you, sir." ("base", "base", "base", "mid")
 
-    call ton_walk(action="leave")
-    jump end_tonks_event
+#     call ton_walk(action="leave")
+#     jump end_tonks_event
 
-label tonks_teacher_event_3_6: #Level 2 Event 2
-    #Spends afternoon making out with ravenclaw, topless
+# label tonks_teacher_event_3_6: #Level 3 Event 2
+#     #Spends afternoon making out with ravenclaw, topless
 
-    return
+#     return
 
-label tonks_teacher_event_3_7: #Level 2 Event 3
-    #Tonks has two best friends make out while she plays with herself
+# label tonks_teacher_event_3_7: #Level 3 Event 3
+#     #Tonks has two best friends make out while she plays with herself
 
-    return
+#     return
 
-label tonks_teacher_event_3_8: #Level 2 Event 4
-    #Another make out sesh with slytherin involving tonks fingering the student
+# label tonks_teacher_event_3_8: #Level 3 Event 4
+#     #Another make out sesh with slytherin involving tonks fingering the student
 
-    call ton_walk(action="leave")
-    jump end_tonks_event
+#     call ton_walk(action="leave")
+#     jump end_tonks_event
diff --git a/game/scripts/characters/tonks/requests.rpy b/game/scripts/characters/tonks/requests.rpy
index e9b10ae4..21db5bec 100644
--- a/game/scripts/characters/tonks/requests.rpy
+++ b/game/scripts/characters/tonks/requests.rpy
@@ -1,66 +1,48 @@
 
-# Public requests
-default nt_pr_teach = event_class(
-    title = "Detention with Tonks.", start_label = "nt_pr_teach_start", start_tier = 1,
-    events = [
-        [
-            ["nt_pr_teach_T1_E1"], # Slytherin boy
-            ["nt_pr_teach_T1_E2"], # Ravenclaw boy
-            ["nt_pr_teach_T1_E3"], # Potter & Weasley
-            ["nt_pr_teach_T1_E4"]  # Slytherin girl
-        ],
-        [
-            ["nt_pr_teach_T2_E1"], # Hufflepuff girl
-            ["nt_pr_teach_T2_E2"], # Ravenclaw boy
-            ["nt_pr_teach_T2_E3"], # Slytherin boy
-            ["nt_pr_teach_T2_E4"]  # Slytherin girl
-        ]
-    ],
-    iconset = [["star_empty", "star_pink"]] # You have to add icons at least for first tier, the rest will be copied over automatically.
-)
+default ton_ev_detention_t1_e1 = Event(id="ton_ev_detention_t1_e1", label="nt_pr_teach_T1_E1", req="game.daytime==False")
+default ton_ev_detention_t1_e2 = Event(id="ton_ev_detention_t1_e2", label="nt_pr_teach_T1_E2", req="game.daytime==False")
+default ton_ev_detention_t1_e3 = Event(id="ton_ev_detention_t1_e3", label="nt_pr_teach_T1_E3", req="game.daytime==False")
+default ton_ev_detention_t1_e4 = Event(id="ton_ev_detention_t1_e4", label="nt_pr_teach_T1_E4", req="game.daytime==False")
 
-default nt_pr_grope = event_class(
-    title = "Hands-on lessons!", start_label = "nt_pr_grope_start", start_tier = 2,
-    events = [
-        [
-            ["nt_pr_grope_T1_E1"], # Slytherin boy
-            ["nt_pr_grope_T1_E2"], # Ravenclaw boy
-            ["nt_pr_grope_T1_E3"], # Potter & Weasley
-            ["nt_pr_grope_T1_E4"]  # Slytherin girl
-        ]# ,
-        # [
-        #     ["nt_pr_grope_T2_E1"], #
-        #     ["nt_pr_grope_T2_E2"], #
-        #     ["nt_pr_grope_T2_E3"], #
-        #     ["nt_pr_grope_T2_E4"]  #
-        # ]
-    ],
-    iconset = [["star_empty", "star_pink"]] # You have to add icons at least for first tier, the rest will be copied over automatically.
-)
+default ton_ev_detention_t1_e1_hub = Event(id="ton_ev_detention_t1_e1_hub", label="nt_pr_teach_start", req="states.ton.tier==1", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t1_e1"])
+default ton_ev_detention_t1_e2_hub = Event(id="ton_ev_detention_t1_e2_hub", label="nt_pr_teach_start", req="states.ton.tier==1", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t1_e2"])
+default ton_ev_detention_t1_e3_hub = Event(id="ton_ev_detention_t1_e3_hub", label="nt_pr_teach_start", req="states.ton.tier==1", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t1_e3"])
+default ton_ev_detention_t1_e4_hub = Event(id="ton_ev_detention_t1_e4_hub", label="nt_pr_teach_start", req="states.ton.tier==1", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t1_e4"])
 
-default nt_pr_kiss = event_class(
-    title = "Oral practice!", start_label = "nt_pr_kiss_start", start_tier = 2,
-    events = [
-        [
-            ["nt_pr_kiss_T1_intro_E1"], # Ravenclaw boy
-            ["nt_pr_kiss_T1_E2"],       #
-            ["nt_pr_kiss_T1_E3"],       # Slytherin girls
-            ["nt_pr_kiss_T1_E4"]        # Slytherin girl
-        ]# ,
-        # [
-        #     ["nt_pr_kiss_T2_E1"], # Slytherin boy
-        #     ["nt_pr_kiss_T2_E2"], #
-        #     ["nt_pr_kiss_T2_E3"], #
-        #     ["nt_pr_kiss_T2_E4"]  #
-        # ]
-    ],
-    iconset = [["star_empty", "star_pink"]] # You have to add icons at least for first tier, the rest will be copied over automatically.
-)
+default ton_ev_detention_t2_e1 = Event(id="ton_ev_detention_t2_e1", label="nt_pr_teach_T2_E1", req="game.daytime==False")
+default ton_ev_detention_t2_e2 = Event(id="ton_ev_detention_t2_e2", label="nt_pr_teach_T2_E2", req="game.daytime==False")
+default ton_ev_detention_t2_e3 = Event(id="ton_ev_detention_t2_e3", label="nt_pr_teach_T2_E3", req="game.daytime==False")
+default ton_ev_detention_t2_e4 = Event(id="ton_ev_detention_t2_e4", label="nt_pr_teach_T2_E4", req="game.daytime==False")
 
-# Idea for "blowjob pr" name: "Stress Mitigation."
+default ton_ev_detention_t2_e1_hub = Event(id="ton_ev_detention_t2_e1_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e1"])
+default ton_ev_detention_t2_e2_hub = Event(id="ton_ev_detention_t2_e2_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e2"])
+default ton_ev_detention_t2_e3_hub = Event(id="ton_ev_detention_t2_e3_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e3"])
+default ton_ev_detention_t2_e4_hub = Event(id="ton_ev_detention_t2_e4_hub", label="nt_pr_teach_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_detention", subevents=["ton_ev_detention_t2_e4"])
 
-default nt_requests_list = [
-    nt_pr_teach,
-    nt_pr_grope,
-    nt_pr_kiss
+default ton_ev_grope_t2_e1 = Event(id="ton_ev_grope_t2_e1", label="nt_pr_grope_T2_E1", req="game.daytime==False")
+default ton_ev_grope_t2_e2 = Event(id="ton_ev_grope_t2_e2", label="nt_pr_grope_T2_E2", req="game.daytime==False")
+default ton_ev_grope_t2_e3 = Event(id="ton_ev_grope_t2_e3", label="nt_pr_grope_T2_E3", req="game.daytime==False")
+default ton_ev_grope_t2_e4 = Event(id="ton_ev_grope_t2_e4", label="nt_pr_grope_T2_E4", req="game.daytime==False")
+
+default ton_ev_grope_t2_e1_hub = Event(id="ton_ev_grope_t2_e1_hub", label="nt_pr_grope_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_grope", subevents=["ton_ev_grope_t2_e1"])
+default ton_ev_grope_t2_e2_hub = Event(id="ton_ev_grope_t2_e2_hub", label="nt_pr_grope_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_grope", subevents=["ton_ev_grope_t2_e2"])
+default ton_ev_grope_t2_e3_hub = Event(id="ton_ev_grope_t2_e3_hub", label="nt_pr_grope_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_grope", subevents=["ton_ev_grope_t2_e3"])
+default ton_ev_grope_t2_e4_hub = Event(id="ton_ev_grope_t2_e4_hub", label="nt_pr_grope_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_grope", subevents=["ton_ev_grope_t2_e4"])
+
+default ton_ev_oral_t2_e1 = Event(id="ton_ev_oral_t2_e1", label="nt_pr_kiss_T2_intro_E1", req="game.daytime==False")
+default ton_ev_oral_t2_e2 = Event(id="ton_ev_oral_t2_e2", label="nt_pr_kiss_T2_E2", req="game.daytime==False")
+default ton_ev_oral_t2_e3 = Event(id="ton_ev_oral_t2_e3", label="nt_pr_kiss_T2_E3", req="game.daytime==False")
+default ton_ev_oral_t2_e4 = Event(id="ton_ev_oral_t2_e4", label="nt_pr_kiss_T2_E4", req="game.daytime==False")
+
+default ton_ev_oral_t2_e1_hub = Event(id="ton_ev_oral_t2_e1_hub", label="nt_pr_kiss_start", req="states.ton.tier>=2", repeat=False, autoenqueue=True, autodequeue=False, queue="ton_eventqueue_oral", subevents=["ton_ev_oral_t2_e1"])
+default ton_ev_oral_t2_e2_hub = Event(id="ton_ev_oral_t2_e2_hub", label="nt_pr_kiss_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_oral", subevents=["ton_ev_oral_t2_e2"])
+default ton_ev_oral_t2_e3_hub = Event(id="ton_ev_oral_t2_e3_hub", label="nt_pr_kiss_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_oral", subevents=["ton_ev_oral_t2_e3"])
+default ton_ev_oral_t2_e4_hub = Event(id="ton_ev_oral_t2_e4_hub", label="nt_pr_kiss_start", req="states.ton.tier>=2", autoenqueue=True, autodequeue=False, queue="ton_eventqueue_oral", subevents=["ton_ev_oral_t2_e4"])
+
+define tonks_requests = [
+    ("ton_eventqueue_detention", "Detention with Tonks!"),
+    ("ton_eventqueue_grope", "Hands-on lessons!"),
+    ("ton_eventqueue_oral", "Oral practice!"),
 ]
+
+# Idea for "blowjob pr" name: "Stress Mitigation."
\ No newline at end of file
diff --git a/game/scripts/characters/tonks/summon.rpy b/game/scripts/characters/tonks/summon.rpy
index 9e6782a1..6dfe9571 100644
--- a/game/scripts/characters/tonks/summon.rpy
+++ b/game/scripts/characters/tonks/summon.rpy
@@ -116,78 +116,31 @@ label tonks_favor_menu:
             jump tonks_requests
 
         "-Personal Favours-" (icon="interface/icons/small/heart_red.webp", style="disabled"):
+            label .favors:
+
             call not_available
             jump tonks_favor_menu
-            #
-            # Uncomment once favours are ready
-            #
-
-            # label .personal:
-            # python:
-                # menu_choices = []
-                # for i in nt_favor_list:
-                    # if i in []: # Not in the game yet.
-                        # menu_choices.append(gui.menu_item("-Not available-", "na", style="disabled"))
-                    # elif i.start_tier > states.ton.tier:
-                        # menu_choices.append(gui.menu_item("-Not ready-", "vague", style="disabled"))
-                    # else:
-                        # menu_choices.append(i.get_menu_item())
-
-                # menu_choices.append(("-Never mind-", "nvm"))
-                # result = renpy.display_menu(menu_choices)
-            # if result == "nvm":
-                # jump tonks_favor_menu
-            # elif result == "vague":
-                # call favor_not_ready
-                # jump .personal
-            # elif result == "na":
-                # call not_available
-                # jump .personal
-            # else:
-                # $ renpy.jump(result)
 
         "-Public Requests-" (icon="interface/icons/small/star_yellow.webp") if game.daytime and states.ton.requests_unlocked:
-            jump tonks_requests_menu
+            label .requests:
+
+            $ result = show_events_menu(tonks_requests)
+
+            if result == "disabled":
+                "You haven't unlocked this request opportunity yet."
+                jump .requests
+            elif result == "exit":
+                jump tonks_favor_menu
+            else:
+                $ result.start()
 
         "-Public Requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not game.daytime or not states.ton.requests_unlocked:
             if not states.ton.requests_unlocked:
                 nar "You haven't unlocked this feature yet."
             elif not game.daytime:
                 nar "Public requests are available during the day only."
+
             jump tonks_favor_menu
 
         "-Never mind-":
             jump tonks_requests
-
-label tonks_requests_menu:
-    call update_ton_requests
-    python:
-        menu_choices = []
-        for i in nt_requests_list:
-            if i in []: # Not in the game yet.
-                menu_choices.append(gui.menu_item("-Not available-", "na", style="disabled"))
-            elif i.start_tier > states.ton.tier:
-                menu_choices.append(gui.menu_item("-Not ready-", "vague", style="disabled"))
-            else:
-                menu_choices.append(i.get_menu_item())
-        menu_choices.append(("-Never mind-", "nvm"))
-        result = renpy.display_menu(menu_choices)
-
-    if result == "nvm":
-        jump tonks_favor_menu
-    elif result == "vague":
-        call favor_not_ready
-        jump tonks_requests_menu
-    elif result == "na":
-        call not_available
-        jump tonks_requests_menu
-    else:
-        $ renpy.jump(result)
-
-label update_ton_requests:
-    # Set event tier to current Tonks tier if they are different
-    python:
-        for i in nt_requests_list:
-            i.tier = states.ton.tier
-
-    return
diff --git a/game/scripts/characters/tonks/vars.rpy b/game/scripts/characters/tonks/vars.rpy
index 0be9d601..f4ab6e26 100644
--- a/game/scripts/characters/tonks/vars.rpy
+++ b/game/scripts/characters/tonks/vars.rpy
@@ -27,6 +27,8 @@ default states.ton.ev.hangouts.astoria_e1 = False
 default states.ton.ev.hangouts.favors_e1 = False
 default states.ton.ev.hangouts.favors_e2 = False
 default states.ton.ev.random_strip.complete = False
+default states.ton.ev.oral_practice.completed_once = False
+default states.ton.ev.hands_on_lessons.completed_once = False
 
 default ton_level_up = None
 
diff --git a/game/scripts/events/quests.rpy b/game/scripts/events/quests.rpy
index 09e120e6..863b8d62 100644
--- a/game/scripts/events/quests.rpy
+++ b/game/scripts/events/quests.rpy
@@ -248,14 +248,6 @@ label quests:
 
         # Tonks events not triggered by a date.
         if nt_event_pause == 0:
-            if game.daytime:
-                pass
-            else:
-                python:
-                    for i in nt_requests_list:
-                        if i.inProgress:
-                            i.inProgress = False
-                            i.start()
 
             $ play_potion_return("tonks")