[DO NOT MERGE] Added initial org-selection stuff