WIP: Add these in too

Change-Id: I1185b918b5070314f1cccc69c6b3ad2116dba4f3