Added some stuff and removed some other stuff

Lots of stuff still not working