Added a bunch of random stuff