Mostly working tree/thumb sync