7.5 Hours into my rework. Adding more color!