Extension initial commit

May need further debug