Begun changes to integrate filter and analysis.