Added a loooooooot of stuff