Organizations

I think I'm finally finished with this branch. Hopefully I didn't miss anything.