Initial partial work on scanning.