Pm- swaddling, I too have a houdini! We use an ergo coccoon which is great! Also there is another one which I can't quote remember, if you want the name just let me know, they are zippered suits, they look funny but have been my lifesaver! You can google them! Hope this helps :-)