Using new DDO. Small fixes. Getting ready to split out generator