Work on adding celery support