Adding a bunch of stuff and changing some stuff