Add back basic flare

TODO:
1) vanirlinks
2)De Novo

Change-Id: I6970830b66c97f42f67f8f3fa15527fc0600ac25