@todo - index these collections