Added some code ... Need to think a bit more about the combo algo