Hmm I should build polling directly into the client