Dev

first merging