initial commit on clientserver branch