Okay, I don't want to jinx myself or anything, but I put Z down for her nap about 20 minutes ago and she never got out of bed. I can still hear her yapping away to herself in there but she's still in her bed!!!!!!!!!!!!!!!!!!!
Yesterday she napped on the floor of her room right in front of the door. Sounds comfy.