More work on console structure.