Continuing work on the desktop client app