Add new status "connecting"
Add TODO