Orgs client property

This finishes up #174