Project Beloved Creatures

So I was thinking about the happy thoughts dwarves get from seeing beloved creatures in a cage, and it occurred to me I could use this to increase the overall happiness at Nutscaves by having some reasonable fun with animals. (Nutscaves is starting to get a little dull, because we're now rich and happy enough, and well-designed enough, and our traps are powerful enough, to solve every problem that's been thrown at us so far.)

Currently pairs of bedrooms for normal dwarves (ones who aren't the mayor and aren't severely unhappy) are built like this:

XXX-XXX
XCB-BCX
XXX-XXX

X=Wall
- =Open Floor
C=Cabinet
B=Bed

and repeat. The bolded area (which includes the open floor, may not be visible on the hyphens) is the area that makes up one bedroom. It's symmetric on the other side and the open floor space is shared (this allows them to put their crap in a cabinet while also keeping the room value low, to prevent the mayor or nobles from getting mad--though I don't have a noble anymore).

Without modifying the current layout, I could build cages on the walkable floor, ideally made of materials the dwarves like, and put creatures they love inside. Cages are perfectly passable and it wouldn't disrupt the flow of dwarves heading to and from bed.

I could also rearrange rooms a bit so that dwarves who loved the same animal could all share floor space with one animal between them.

Animals that are detestable (such as rats) would not be eligible for this Tantrum Insulation Plan. Dwarves who love detestable animals will receive a new room layout, with the detestable animal hidden from passersby.

It's a little bit micromanagey since I have to look in individual profiles to find the beloved animals, and then consult the Room directory to find the dwarf's room, and build the cage and put the right animal inside. The other option would be to shove the everything-cage into the main stairwell in an all-purpose manner, but that's somehow just not as cute and cuddly.

I should also be working on bringing up some more magma for Project Goblin Equipment Sorter, but I'm a little stalled on that at the moment because I've either got to find a convenient way to move the goblins that I trap below the drawbridge, down below the aquifer, or I've got to bring the magma up above the aquifer. Both are fairly arduous tasks because of the small dimensions of the freeway I've punched through the aquifer, and both will require a new layout for the top level of the fort. A smarter builder than me could probably have done this already, but all I've got is me so...I sort of sit and think about how to do it the least painful way, while letting time pass in Nutscaves.