I always swaddled my DS in his hammock