Agents + client RMI WIP
Mergefix