Almost done

Close to fin server and client