near production ready, checking index progress is still buggy