Add a bunch of new stuff