Firm types

Might want to remove that before merging