finished logic - "trap" still has bugs

goes into the elsif statement, then doesn't mark anything if the
conditions are false