Waiting for God S04 E04 Shelves

"A Comedy About Growing Old Disgracefully"

Geoffrey is getting on Tom's nerves with his obsession with shelves, which he keeps putting up all over the unit and it's a blessing when he gets a call from Marion, asking him to get back with her. Tom is not the only resident missing Diana as she is seen as a source of advice, but Diana herself, a thoroughly incompetent nanny, is missing Bayview and, after ruining a fashion show goes 'home' to Tom.