Started adding a more complex selection engine