First commit with almost extension complete