But that looks amazing so far! I've tried to find a solution to match the additional information as well, but i wasn`t successful.
Your solution works for me as well - I have also implemented it already