Beginning of serious client-server refactoring