Organ list refactor.

DO NOT MERGE YET.