Wade the Nudist (Rated X)

So we're having issues with Wade always wanting to take his diaper off himself. When we go in to get him in the morning or from naps we find him with his diaper off. He has either emptied the #2 contents or picked a spot in his crib to 'mark his territory' (if you know what I mean). We've tried duct tape, didn't work. We've tried onesies, didn't work. I don't think he's ready for undies yet, but even as cute as it is I'm getting tired of finding this...