I have not revisited this PR yet, it will likely take a little more work.