Most of it is now working. Some indexing is screwed up.