First working commit
merging conflicts