Last version with fixed Combos. Some (much needed) refactor done.