MILESTONE1

This commit can be a mile stone if anything gone wrong later, can
checkout from here. Let's name it as MILESTONE1