diff --git a/lib/deaf_grandma.rb b/lib/deaf_grandma.rb
index 83ad52a..2c2fa75 100644
--- a/lib/deaf_grandma.rb
+++ b/lib/deaf_grandma.rb
@@ -20,7 +20,18 @@ def run!
 
   def speak(input)
 
-    #Implement your code here <<<<<<<<<
+    if input == "BYE" && @bye_counter == 2
+      @bye_counter = 0
+      return "SEE YOU LATER SONNY!"
+    elsif input == input.upcase
+      if input == "BYE"
+        @bye_counter += 1
+      end
+      return "NOT SINCE 1964!"
+    else 
+      return "SPEAK UP SONNY!"
+    end
+
 
   end
 
diff --git a/lib/fizzbuzz.rb b/lib/fizzbuzz.rb
index 86f9def..6ae553f 100644
--- a/lib/fizzbuzz.rb
+++ b/lib/fizzbuzz.rb
@@ -2,7 +2,20 @@ class SuperFizzBuzz
 
   def run(input)
 
-    #Implement your code here
+    text = ""
+    if input % 3 == 0
+      text << "Fizz"
+    end
+
+    if input % 5 == 0
+      text << "Buzz"
+    end
+
+    if text == ""
+      return input
+    else
+      return text
+    end
 
   end
 
diff --git a/spec/deaf_grandma_spec.rb b/spec/deaf_grandma_spec.rb
index cf09766..ef01547 100644
--- a/spec/deaf_grandma_spec.rb
+++ b/spec/deaf_grandma_spec.rb
@@ -9,10 +9,12 @@
   end
   
   it "says 'NOT SINCE 1964!' when we yell" do
-    #implement your test here
+    expect(script.speak("HI, GRANDMA")).to eq "NOT SINCE 1964!"
   end
 
   it "EXTRA CREDIT: How would you test yelling BYE?" do
-    #implement your test here
+    expect(script.speak("BYE")).to eq "NOT SINCE 1964!"
+    expect(script.speak("BYE")).to eq "NOT SINCE 1964!"
+    expect(script.speak("BYE")).to eq "SEE YOU LATER SONNY!"
   end
 end
diff --git a/spec/fizzbuzz_spec.rb b/spec/fizzbuzz_spec.rb
index cfda46b..691d631 100644
--- a/spec/fizzbuzz_spec.rb
+++ b/spec/fizzbuzz_spec.rb
@@ -9,14 +9,14 @@
   end
   
   it "returns 'Buzz' when my input is divisible by 5" do
-    #implement your test here
+    expect(script.run(5)).to eq "Buzz"
   end
 
   it "returns 'FizzBuzz' when input is divisible by 3 & 5" do
-    #implement your test here
+    expect(script.run(15)).to eq "FizzBuzz"
   end
   
   it "returns the input number when input isn't divisible by 3, 5, or both" do
-    #implement your test here
+    expect(script.run(1)).to eq 1
   end
 end