broke several methods out & introduced parsing on selector addition/removal