Ok I'm sureish indexing more or less works now, I think
Merge branch 'master' of https://github.com/Ourobor/petulant-batman