added collector, starting some actual testing