More progress to 1.7, added assets, still errors