Completed changes to Company feature. Now separated into three tiers instead of using mixed logic.