Started revamp on feature selection classes