Further developed Connected, still a lot TODO...