Going to merge this into our staging cluster to test some stuff out, but I'll get this cleaned up better before I create a a PR on master