Update to support several clients and so on

A lot is left.