I definitely just finished hacking on this problem for our deployment and this is a much better solution. Docs look great too.