WIP on Dibs - not completed since we don't have a current client using them