I've got the solution:
No more apartments or villas, just one big dormitory for 2 million people.
On arrival at Doha airport you pick a number out of the hat and thats your bed.
Is this multicultural enough?
Bonus is think how much you would save from your housing allowance.

just eat another pie