Add samples + fix result/match assignment to step + start working on tag