First pass on restructure of diab.