Foundation for new ignore option.
Finish additions.