Add a bunch of stuff, flesh out some junk