Add debug
Resolve dependency
Remove deubg
Resolve companies
Simplify
Add test
More tests.
simplify