first working commit
merge