Compiled through to step 3.3 wait for client