Better index handling, work towards seeking