Cleaned up more code. Added Contacts to the Company object.