Added a lot of stuff. Still not working