Draft: Use new connect syntax (2)
Continuing from merge request !6 (closed) . Added commits for fixing auto-formatting and rebased on latest master.
Continuing from merge request !6 (closed) . Added commits for fixing auto-formatting and rebased on latest master.