Refactor to full-blown UCDA complete.