modified includeds and constructors to handle the new _ in some of the data files
Merge branch 'allTogether'
merge updates