Changed names and did alittle bit of updating. Still needs a bit of work