working on connect
LOg
more connect
merge conflict