Added a bunch of stuff.  Not going to list it all.