diff --git a/applications/tappytux/gameconfigform.pas b/applications/tappytux/gameconfigform.pas
index 6fd7e2525..b38e0d6d1 100644
--- a/applications/tappytux/gameconfigform.pas
+++ b/applications/tappytux/gameconfigform.pas
@@ -86,18 +86,6 @@ end;
 procedure TformConfig.comboSoundChange(Sender: TObject);
 begin
 
-  Case comboSound.itemIndex of
-  0: begin
-    //gameData.SndFX := true;
-    end;
-
-  1: begin
-    //gameData.SndFX := false;
-    end;
-
-  end;
-
-
 end;
 
 procedure TformConfig.FormClick(Sender: TObject);
diff --git a/applications/tappytux/gameplayform.pas b/applications/tappytux/gameplayform.pas
index 7887f9f0d..7a6ff5e40 100644
--- a/applications/tappytux/gameplayform.pas
+++ b/applications/tappytux/gameplayform.pas
@@ -64,15 +64,8 @@ begin
   if Key = #13 then
   begin
     formTappyTuxGame.Test.Lines.Add(Answer.Text);
-
-    if (Answer.Text = Question1.Text) then Question1.Top := 50;
-    if (Answer.Text = Question2.Text) then Question2.Top := 50;
-    if (Answer.Text = Question3.Text) then Question3.Top := 50;
-    if (Answer.Text = Question4.Text) then Question4.Top := 50;
-    if (Answer.Text = Question5.Text) then Question5.Top := 50;
-
+    GetCurrentModule().Answered();
     formTappyTuxGame.Answer.Clear;
-    //TappyTuxGame.ThrowHammer();
 
   end;
 end;
@@ -90,10 +83,5 @@ begin
 end;
 
 
-{procedure TformTappyTuxGame.OnClose;
-begin
-  formConfig
-end;}
-
 end.
 
diff --git a/applications/tappytux/mod_tappymath.pas b/applications/tappytux/mod_tappymath.pas
index 42f920d2c..aee4e717c 100644
--- a/applications/tappytux/mod_tappymath.pas
+++ b/applications/tappytux/mod_tappymath.pas
@@ -21,6 +21,7 @@ type
     procedure TranslateTextsToEnglish; override;
     procedure TranslateTextsToPortuguese; override;
     procedure StartNewGame(SndFX: Integer; Music: Integer; Level: Integer); override;
+    procedure Answered(); override;
     procedure EndGame(); override;
   end;
 
@@ -50,6 +51,11 @@ begin
 
 end;
 
+procedure TTappyMath.Answered;
+begin
+
+end;
+
 procedure TTappyMath.EndGame;
 begin
 
diff --git a/applications/tappytux/mod_tappywords.pas b/applications/tappytux/mod_tappywords.pas
index 83fdec74a..fe2243f7d 100644
--- a/applications/tappytux/mod_tappywords.pas
+++ b/applications/tappytux/mod_tappywords.pas
@@ -26,6 +26,7 @@ type
     procedure TranslateTextsToEnglish; override;
     procedure TranslateTextsToPortuguese; override;
     procedure StartNewGame(SndFX: Integer; Music: Integer; Level: Integer); override;
+    procedure Answered(); override;
     procedure EndGame(); override;
   end;
 
@@ -90,6 +91,16 @@ begin
 
   end;
 
+procedure TTappyWords.Answered;
+begin
+  if (formTappyTuxGame.Answer.Text = formTappyTuxGame.Question1.Text) then formTappyTuxGame.Question1.Top := 50;
+  if (formTappyTuxGame.Answer.Text = formTappyTuxGame.Question2.Text) then formTappyTuxGame.Question2.Top := 50;
+  if (formTappyTuxGame.Answer.Text = formTappyTuxGame.Question3.Text) then formTappyTuxGame.Question3.Top := 50;
+  if (formTappyTuxGame.Answer.Text = formTappyTuxGame.Question4.Text) then formTappyTuxGame.Question4.Top := 50;
+  if (formTappyTuxGame.Answer.Text = formTappyTuxGame.Question5.Text) then formTappyTuxGame.Question5.Top := 50;
+
+end;
+
 procedure TTappyWords.EndGame;
 begin
   timerWords.Enabled := False;
diff --git a/applications/tappytux/tappymodules.pas b/applications/tappytux/tappymodules.pas
index 20ba3a104..4a6c98e4c 100644
--- a/applications/tappytux/tappymodules.pas
+++ b/applications/tappytux/tappymodules.pas
@@ -25,6 +25,7 @@ type
     procedure TranslateTextsToPortuguese; virtual;
     procedure InitModule(); virtual;
     procedure StartNewGame(SndFX: Integer; Music: Integer; Level: Integer); virtual; abstract;
+    procedure Answered(); virtual; abstract;
     procedure EndGame(); virtual; abstract;
   end;