revert to battle tested iteration
Add basic highlighting