https://rbcommons.com/s/twitter/r/3300/ and https://rbcommons.com/s/twitter/r/3320/ are ready to be reviewed when folks get a chance