New client solution.

Renamed the client and got rid of the view model locator...