adding a bunch of stuff

Change-Id: I8984a385689a32ac7af534da862322e5a81babab
fix conflicts

Change-Id: Icb9ca265e72da2d5e2ad6800873760d2601570a3