Rearrange includes.
Implement a partial connection method.