Added ALOT of stuff