Integrate the design

It closes #98