diff --git a/fizzbuzz.py b/fizzbuzz.py
new file mode 100644
index 0000000..e0fd370
--- /dev/null
+++ b/fizzbuzz.py
@@ -0,0 +1,17 @@
+class FizzBuzz(object):
+
+    def __init__(self,num):
+        self.num = num
+
+    def process(self):
+        n = self.num
+
+        if n%3==0 and n%5==0:
+            ret = 'FizzBuzz'
+        elif n%3==0:
+            ret = 'Fizz'
+        elif n%5==0:
+            ret ='Buzz'
+        else:
+            ret = str(n)
+        return ret
\ No newline at end of file
diff --git a/test_fizzbuzz.py b/test_fizzbuzz.py
new file mode 100644
index 0000000..1daf4a2
--- /dev/null
+++ b/test_fizzbuzz.py
@@ -0,0 +1,13 @@
+import unittest
+import fizzbuzz
+
+class testfizzbuzzz(unittest.TestCase):
+
+    def test(self):
+        self.assertEqual(fizzbuzz.FizzBuzz(1).process(),'1')
+        self.assertEqual(fizzbuzz.FizzBuzz(3).process(),'Fizz')
+        self.assertEqual(fizzbuzz.FizzBuzz(5).process(),'Buzz')
+        self.assertEqual(fizzbuzz.FizzBuzz(15).process(),'FizzBuzz')
+
+    if __name__ == "__main__":
+        unittest.main()
\ No newline at end of file