Added additional files from Adithi's merge.