Started work to make "dub" compatible with "lub".
More work to move to 'lub' compatibility