Rework order of things when accepting incoming connections