More work on retrieve.