DRAFT: Trying to get it ready
DRAFT: Almost there
DRAFT: Fix to index