server stuff for welcome msg
merge
changes for welcome