Import a CSV of addresses to the company section only and be able to add custom fields to that section, so you don't have to add them manually and be limited in terms of the data you can hold on the actual company.