This is ready to go, if someone could merge it for me! https://rbcommons.com/s/twitter/r/2948/