V.2
Add some design to the code.