New design implementation
Merge pull request #47 from CruGlobal/THINK-Design-ADM

New design implementation