Work continuing on the client