Added TODO (namespaces).
Fleshing out client connection state flow.