Handle system clients

Handle when system clients are added or a switch request is received.

Issue: #19