inline piggy wip

Change-Id: I3dce0eca485a4a1c23e7a13f7b266638314d4e3e