ComboState now returns lists of frames
NO
Merge branch 'master' of github.com:rhanak/merwar
NEIN NEIN NEIN NEIN NEIN!!!!