Fixing adding tenant
cleaning up the TODOs