almost done

first time done before fixing the client's requests