Progress on initial org/profile logic.