Work on client mechanics