Mostly finished implementing Client. Still some bugs to sort out.