perfecting the celery logic, maybe