Added Long Polling - Almost...