Started work that standardizes the client responses