Added a bunch of awesome stuff