I have a different idea for this for now... Let me update the PR and see what you guys think.