I agree, that wouldn't be tough. Let's leave that for another PR since this accomplishes its task, that can be in another.