finished rng refactor for source concept