refactored Incident to Behavior except database refs