Working on demo, index generation code is up to date now, need to update client next