yeah. I’m actually working on a similar issue