diff --git a/python/gilded_rose.py b/python/gilded_rose.py
index 4f21ea64..07b2d311 100755
--- a/python/gilded_rose.py
+++ b/python/gilded_rose.py
@@ -7,40 +7,56 @@ class GildedRose(object):
 
     def update_quality(self):
         for item in self.items:
-            if item.name != "Aged Brie" and item.name != "Backstage passes to a TAFKAL80ETC concert":
-                if item.quality > 0:
-                    if item.name != "Sulfuras, Hand of Ragnaros":
-                        item.quality = item.quality - 1
-            else:
-                if item.quality < 50:
-                    item.quality = item.quality + 1
-                    if item.name == "Backstage passes to a TAFKAL80ETC concert":
-                        if item.sell_in < 11:
-                            if item.quality < 50:
-                                item.quality = item.quality + 1
-                        if item.sell_in < 6:
-                            if item.quality < 50:
-                                item.quality = item.quality + 1
-            if item.name != "Sulfuras, Hand of Ragnaros":
-                item.sell_in = item.sell_in - 1
-            if item.sell_in < 0:
-                if item.name != "Aged Brie":
-                    if item.name != "Backstage passes to a TAFKAL80ETC concert":
-                        if item.quality > 0:
-                            if item.name != "Sulfuras, Hand of Ragnaros":
-                                item.quality = item.quality - 1
-                    else:
-                        item.quality = item.quality - item.quality
-                else:
-                    if item.quality < 50:
-                        item.quality = item.quality + 1
+            self.update_sell_in(item)
+            self.update_item_quality(item)
+
+    def update_sell_in(self, item):
+        if item.name != "Sulfuras, Hand of Ragnaros": 
+            item.days_left -= 1
+
+
+    def update_item_quality(self,item):
+        if item.name == "Aged Brie":
+            self.update_aged_brie_quality(item)
+        elif item.name == "Backstage passes to a TAFKAL80ETC concert":
+            self.update_backstage_passes_quality(item)
+        elif item.name == "Sulfuras, Hand of Ragnaros":
+            pass
+        else:
+            self.update_normal_item_quality(item)
+
+    def update_normal_item_quality(self,item):
+        if item.quality >0:
+            item.quality -=1
+
+        if item.days_left < 0 and item.quality > 0:
+            item.quality -= 1
+
+    def update_aged_brie_quality(self, item):
+        if item.quality < 50:
+            item.quality += 1
+        if item.days_left < 0 and item.quality < 50:
+            item.quality += 1
+
+
+    def update_backstage_passes_quality(self, item):
+        if item.days_left < 0:
+            item.quality = 0
+        elif item.days_left < 5:
+            item.quality += 3
+        elif item.days_left < 10:
+            item.quality += 2
+        else:
+            item.quality += 1
+        if item.quality > 50:
+            item.quality = 50
 
 
 class Item:
-    def __init__(self, name, sell_in, quality):
+    def __init__(self, name, days_left, quality):
         self.name = name
-        self.sell_in = sell_in
+        self.days_left = days_left
         self.quality = quality
 
     def __repr__(self):
-        return "%s, %s, %s" % (self.name, self.sell_in, self.quality)
+        return "%s, %s, %s" % (self.name, self.days_left, self.quality)
\ No newline at end of file
diff --git a/python/test_gilded_rose.py b/python/test_gilded_rose.py
index 1c92f638..b8a1ec8e 100644
--- a/python/test_gilded_rose.py
+++ b/python/test_gilded_rose.py
@@ -5,12 +5,34 @@ from gilded_rose import Item, GildedRose
 
 
 class GildedRoseTest(unittest.TestCase):
-    def test_foo(self):
-        items = [Item("foo", 0, 0)]
-        gilded_rose = GildedRose(items)
-        gilded_rose.update_quality()
-        self.assertEqual("fixme", items[0].name)
 
-        
+    def test_regular_item(self):
+        items = [Item("Normal Item", 10, 15)]
+        gr = GildedRose(items)
+        gr.update_quality()
+        self.assertEqual(items[0].days_left, 9) #days decreases
+        self.assertEqual(items[0].quality, 14) #quality decreases
+
+    def test_aged_brie(self):
+        items = [Item("Aged Brie", 10, 40)]
+        gr = GildedRose(items)
+        gr.update_quality()
+        self.assertEqual(items[0].quality,41)  #increases in quality
+
+    def test_backstage_passes(self):
+        items = [Item("Backstage passes to a TAFKAL80ETC concert", 5, 20)]
+        gr = GildedRose(items)
+        gr.update_quality()
+        self.assertEqual(items[0].quality, 23)  #increases in quality by 3
+
+    def test_sulfuras(self):
+        items = [Item("Sulfuras, Hand of Ragnaros", 5, 80)]
+        gr = GildedRose(items)
+        gr.update_quality()
+        self.assertEqual(items[0].quality, 80) #stays the same
+        self.assertEqual(items[0].days_left, 5)  #stays the same
+
+
+
 if __name__ == '__main__':
     unittest.main()