naming consistency
parameterize organism id properly