Started working on indexes; moved conditions/predicates from tabula