1071565 update eu

This isn't done. A bunch of other things need fixing.

Posting this for feedback before I go do a lot of work that might get ditched.

feedback?
The ramification of storing things is that it chews up more space in ES. We probably don't care a whole lot about that since we've got a relatively small index.