I added some things that i have not fixed all up and things