Tag index

Just starting on this, not for merging yet, but feedback welcome.
we do, adding back in