Tertiary FML
Merge pull request #496 from christopherleckie/master

More Tertiary Panel Shuffling