Mostly finished Client