move more gathering stuff to own scripts