Potentially update to 1.7 - yet to be tested. CI is up next.