Starting to swap out libraries with curb based libraries