commit initial progress working through refactoring index