mostly functioning but I seem to have broken some of the interactions with recent changes... frown.