diff --git a/fizzbuzz.py b/fizzbuzz.py
new file mode 100644
index 0000000..57bec2f
--- /dev/null
+++ b/fizzbuzz.py
@@ -0,0 +1,14 @@
+def process(number):
+    if number % 15 == 0:
+        return 'FizzBuzz'
+    elif number % 3 == 0:
+        return 'Fizz'
+    elif number % 5 == 0:
+        return 'Buzz'
+    else:
+        return number
+
+
+if __name__ == '__main__':
+    for i in range(1, 101):
+        print(process(i))
diff --git a/helloworld.py b/helloworld.py
deleted file mode 100644
index 449b948..0000000
--- a/helloworld.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def get_greetings():
-    return 'Hello World!'
diff --git a/helloworld_test.py b/helloworld_test.py
deleted file mode 100644
index 4c27dfe..0000000
--- a/helloworld_test.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from helloworld import get_greetings
-
-
-def test_get_helloworld():
-    assert get_greetings() == 'Hello World!'
diff --git a/test_fizzbuzz.py b/test_fizzbuzz.py
new file mode 100644
index 0000000..54a8b4d
--- /dev/null
+++ b/test_fizzbuzz.py
@@ -0,0 +1,21 @@
+import fizzbuzz
+import unittest
+
+
+class TestFizzBuzz(unittest.TestCase):
+
+    def test_div3(self):
+        self.assertEqual(fizzbuzz.process(3), 'Fizz')
+
+    def test_div5(self):
+        self.assertEqual(fizzbuzz.process(5), 'Buzz')
+
+    def test_div3and5(self):
+        self.assertEqual(fizzbuzz.process(15), 'FizzBuzz')
+
+    def test_divother(self):
+        self.assertEqual(fizzbuzz.process(2), 2)
+
+
+if __name__ == '__main__':
+    unittest.main()