Working on converting Client into a standalone program