First working draft of extension.

Change-Id: I6560493a6eb07f6354643d00d116280ecfea1ccf