Add work from Anil, Safa, and Aaron's branches