Move init stuff here

Change-Id: I0bee5659b8c04727d34424cf9cd36dce8845856b