Adapted most of the lightcone selector to the new state, not quite finished, but getting there...