This will be non-trivial to fix without 1st yak shaving all the stuff Eric design-doc'd for the ivy.xml half of things