I've managed to get this mostly working, however there is still some work that needs to be done. I'm starting this issue to link and track my fork until the PR is ready and to discuss issues related to it.