Further implementation of Connectivity checks (Not finished)