Started to work in index checking... needs work