More work on structure.