properly parsing and mapping, should be passing back all companies now