started working on client (again)