Initial commit of new design

Initial commit of new design.