Update with a bunch of new stuff