half way through, won't compile

Change-Id: I5b349b7867e2343e105203cb29daaefbda7501c7