In case someone is reading this, this has been solved. Can use this node-group below or the one here.
Good luck.