Added first cut of the extension