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?
Just curious, what do you mean bu stuff in the mapping set to be stored? is that an extra attribute or something?