Company mini refactor
Merge branch 'working'

MINI REFACTOR OF COMPANY model