First commit for basic user indexing