Initial commit of skeleton
removed conflicts