Add some more stuff for that last commit... still not building yet

Change-Id: Ia38a060807cb62931e4f3010a1fd29d18d227fd9