Segregate state tracking from light control -- step 1