add a bunch of new stuff