Fix things, add timer to client