More work on the console logic.