Index spice up

This should close #2