Initial work towards agnostic completion