Updated to v1.7 (in progress)

Not complete