Added a bunch of stuff.

I know, I know. I should have been checking in along the way.
Bad Andy!
Change shelter to organization