Start simplifying the client internals
Update example