General organization, also adding component selection functionality