WIP adding indexes