Working on initial client app