Added a bunch of stuff..bump!