Ugh any advice ?

My 4 month old LO is the most restless baby on the planet I swear. He does NOT stop moving. He wakes himself up constantly because he can’t settle himself down. When I lay him in the crib, he immediately rolls to his tummy and then moves his head back and forth a hundred times, stuffing it in the mattress each time, and eventually turns to frustration and tears. He does it when when he’s laying on my chest.

When he’s on his back, kicks and hits and wiggles. He does this even in his sleep. I used to be able to swaddle him but he rolls and sits so it’s just not safe anymore.

He sleeps in 15-60 minute stretches though, day and night, so this is getting a bit ridiculous.

Any tips for helping him calm down?