more wip on cm/client refactor
wip on celery task refactoring