Still need to fix contamination indexing, everything else working as expected