Client Startup Overhaul