program client controller function almost completed
resolved conflicts