Got screwed up with some merge issue.
Lost client.c progress. oh well, bedtime...