I'm thinking of just going ahead and buying a panty gaff. I've got the tucking down...rather easy to do actually. I also have discovered., at least with me anyway, that tucking also helps with a more convincing girl walk as it allows my legs to get closer together, without any obstructions.
