Adding incidents and behaviors functionality finished