Ongoing work on the console refactoring.