master: Updates for transfer from Client to Server.. we should really look into SVN