Cleaning up the connection code a lot
Adding back in protection against cut connections
Adding support for .co.uk style domains