Cleaned up so initialisation of servers/clients also starts server/client connections