Added a bunch of stuffs