Add controlling server
Adapt a bit
Re-add messages