More selector nonsense

This is a pain to edit and test.