Merge1

First simple functionality