Starting to implement adding "Company Fields"