client almost finished
merge