Adds a bunch more of stuff and whatnot despite jeff's objections.