initial working draft for insights and alerts
merging conflicted files