Updated with working client/server relationship