added some client/server testing and touched files for client