Add scheduler / polling functionality back in