make GenericHydra collectible; closes #5
complete the merge