I haven't forgotten about this PR. I've been super busy. I've code reviewed it and it looks good, but I need to functionally test it. Give me another day or two and I'll get it tested and hopefully merged.