Hierarchical organizations

If this bug is not fixed today, then yes, I will create it.