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?