Initial commit for a multi-tenant configuration

Nice catch