Added a bunch of goodies