First initial pass of 1.7 update