Updating to 1.7

Doing a few rollbacks and then doing a full update to 1.7