Radiation refactor, part 1 - incomplete