Implement control struct index storage
Fix tuple error.

Ideally, only recursion remains.