Made great progress, got filtering working