BLUE-9 : Split out client and server