big update. expanding selectors significantly.