Api/extension

Evaluting merge for whacked extensions.