Yeah, was going to work on this but realized the scope was way beyond this branch. Will open up a new issue, sort of have the design in mind.