Stalk'ify

Change-Id: I7ab3f6fd8a7b0c6756046b2e4fab30621e3c5dc4