Got rid of several clustered indices, added a way to nest lists