Commit
line serv conf changes - for ND testing
Server2Server BS - connect - partially implemented