Added a shit ton of stuff