dereks changes
merge conflict
got rid of some crap that was hanging around
fixed industry model
resolve conflicts