[wip] v2

Work in progress.

Related with #17 

![tiqav](http://tiqav.com/s4.jpg)