I think that's a good idea, it's basically what I did in my earlier PR redoing the console.