Added test to make frames get grouped in twos, made it green, refactored significantly.