yes, I will add a card for that for @ekashida to work on.