We bought this pack n play:
pTRU1-4156294dt.jpg
I have Desi's dog bed, a puppy pad and a bowl of water in it. This is what he sleeps in. He likes to be covered when he sleeps, so I bought a fitted crib sheet and I put that over the top and he sleeps all night without whining.
We've done this since the first night.