Begin re-architecting performance selector