First 1.7 attempt - not yet tested!