first pass at new ignore logic
merge