Lots of things added

Deleted things from the overall one cause i moved it to other files