Connectors are now being loaded. But it's a big clusterf***. Need to rework layout... AGAIN!
Merge remote-tracking branch 'origin/master'