Starting the move towards Client/Server architecture