More work on migrating consoles to new system