Working on better socket and server integrations