Finished the new Combo System. Fixed #2