basics work

Change-Id: I30a5982b7ec56ee786eb9cf4f765bbb556c3d1f4