0022: Intermediate commit. Almost works