Initial suggestion for extension implmentation.

I'm not sure we need these comment lines.