Beginnings of backend client refactoring