Now indexing - but needs major improvement of fiddly bits