merged blah
fixed .filters
ALL GOOD GUYS!!!