Added combo support

also some merging stuff... ALWAYS PULL BEFORE WORKING - dumbass