@testallthings I would try swaddling and keeping the baby in your arms horizontally eg in your lap vs. upright on your shoulder. Its an easier transition to the crib/bassinet for the baby. Doesnt work 100% of the times but you could try this out if you havent already.
