I really love your second idea ^^
It's a pity that for example deaf or blind cat immediately is moved to the elders den. I mean, if a cat was in a major accidant and received major injuries and is moved to the elders den then it's pretty understanable.