More client pre-start coding