Still a bit of a draft, but it’s a bunch of refactor that should help.