910 filtering

Starting this now for review purposes, even though it's not done.