Added a TODO or two to address connection issues.