1.7 update.

About half of my work deleted.