Monster Merge

Ok, here are all my changes.  I believe the merge from Jamie broke some test so you might want to merge to just before that pull request.