Begin making client.cpp more modular