Celery refactor

No due date 91% complete