Split draw and frame grouping
Split draw and frame grouping

Just to make the code easier to read/modify

Also fix silently ignored error

Qining/gapid,baldwinn860/gapid,baldwinn860/gapid,google/agi,ek9852/gapid,pmuetschard/gapid,baldwinn860/gapid,google/agi,pmuetschard/gapid,dsrbecky/gapid,Qining/gapid,dsrbecky/gapid,ek9852/gapid,google/gapid,dsrbecky/gapid,dsrbecky/gapid,ek9852/gapid,google/gapid,google/gapid,baldwinn860/gapid,Qining/gapid,pmuetschard/gapid,ek9852/gapid,google/agi,google/gapid,dsrbecky/gapid,google/gapid,pmuetschard/gapid,pmuetschard/gapid,baldwinn860/gapid,pmuetschard/gapid,Qining/gapid,baldwinn860/gapid,ek9852/gapid,Qining/gapid,dsrbecky/gapid,baldwinn860/gapid,google/gapid,baldwinn860/gapid,google/agi,Qining/gapid,ek9852/gapid,ek9852/gapid,Qining/gapid,google/gapid,dsrbecky/gapid,google/agi,pmuetschard/gapid,Qining/gapid,google/agi,ek9852/gapid,google/agi,pmuetschard/gapid,google/agi,google/gapid,dsrbecky/gapid