Getting ready to cut v0.1700