Forgot the client :)

Same as last one, fix the line issue. Also add support for more than
just client and server.