collectors seperated and gom integration, start commenting and testing