Initial commit. Begin restructuring tasks now that celery tests are properly running