Easy task, but I'll need time to implement it. I'm just creating this issue to remind myself that I have to do it.