I have some WIP work on this in a branch, let me link it