Let's just start from the beginning

Change-Id: I66e3b85eee6f0989877cacff379182b5d739a14d