away with mongo
added company data
merged conflict