Progress Day 14.5

Made ton changes still having issues the code is overwhelming me at
this point its due in today and if i had one more day it be near
perfect.