Add fuga
Merge add-fuga into deployment/staging