adding a bunch of new stuff