Show the index
Working on first pass
Fixed various bugs
Merge branch 'dev'