Separate client and server files.  Brought in Q.