Continued to uncouple company from the overall datasource. Will move to new Datasource later.