Add shuffle and matrix tracking
New classes for tracking