second commit

Changed a lot of stuff