Done for today. Lots of progress for 1.7 update.