Added a loooot of stuff