Finish the refactoring Client/Server model.