Fixed Company Waterfall; Refactor Company Report