Fresh start for 1.7

Much easier than trying to fix everything.