Lots of work on attributes and indexes
Merge Craig