Add Vigor #3

Change-Id: I187c0f6a24f0fef7bce643f49ac1faca16cc5d86