She's went back to the underwear following her nap. This morning, I got tired of fighting with her when she clearly had to go (she was dancing around and whining), so I put her in a diaper to run some errands. After the nap, she got to try out some new Hello Kitty underwear, and shortly after proudly announced that she had made pee pee in her pants. Not there yet...