initial commit of the skeleton
fixed merge