Add cucumber code and some base code
merge body