finished porting selectors to common engine