Scamp restoration

More progress....