Feature/swift celery

Rebase