Updated Client to manage its own viewer, window etc.