HUGE CHANGES:  revamped adding company metrics... still working on it, PLEASE be careful with pulling and stuff