getting baby to sleep:

anyone else baby sleep longer when swaddled just enough to break free when baby rolls or moves in their sleep? i’ve tried laying baby in crib without swaddling and wakes up immediately or tossed and turnes all night. i get too tired by like 4-5am and put him in bed with us and he sleeps for a long time! i figured since he’s getting older and takes 3 naps during that day night time would be better. what can i do? we’re also moving soon and he won’t have his crib for a few weeks. i don’t want him to get used to sleeping with us 😅