Refactoring the client to be more client like i suppose... Updating simple test and adding constants to be used in the app